Remove invalid code in Karaf 3 instance script

If jvm version is lower than 1.8.0, the checkJvmVersion
function will exit. As a result, check jvm version code
is invalid in subsequent setupDefaults function.

Karaf 4 patchs files are not updated.

Change-Id: I20b22a59ceb92ac76523d135e15a3920f258700e
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance
index c9542e38144e0378671e0834d790edaed5653de7..595c77faa0ef61d45cdc7f3fd92d7f917510482d 100755 (executable)
--- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance
@@ -269,17 +269,6 @@ setupDefaults() {
 
     #Set the JVM_VENDOR specific JVM flags
     if [ "$JVM_VENDOR" = "SUN" ]; then
-        # permgen was removed in Java 8
-        VERSION=`$JAVA -version 2>&1 | egrep '"([0-9].[0-9]\..*[0-9]).*"' | awk '{print substr($3,2,length($3)-2)}' | awk '{print substr($1, 3, 3)}' | sed -e 's;\.;;g'`
-        if [ "$VERSION" -lt "80" ]; then
-            # Check some easily accessible MIN/MAX params for JVM mem usage
-            if [ "x$JAVA_PERM_MEM" != "x" ]; then
-                DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:PermSize=$JAVA_PERM_MEM"
-            fi
-            if [ "x$JAVA_MAX_PERM_MEM" != "x" ]; then
-                DEFAULT_JAVA_OPTS="$DEFAULT_JAVA_OPTS -XX:MaxPermSize=$JAVA_MAX_PERM_MEM"
-            fi
-        fi
         DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
     elif [ "$JVM_VENDOR" = "IBM" ]; then
         if $os400; then