From 4fa2ddeef202f1021dfb2e779d97c6982bb3257e Mon Sep 17 00:00:00 2001
From: Lorand Jakab <lojakab@cisco.com>
Date: Fri, 5 Feb 2016 10:47:12 +0200
Subject: [PATCH] JVM8: Remove PermSize and MaxPermSize options

PermSize and MaxPermSize JVM options are not supported in Oracle Java 8.
Since Boron only supports Java 8, they no longer need to be set. This
avoids the following warning: "Java HotSpot(TM) 64-Bit Server VM
warning: ignoring option MaxPermSize=512m; support was removed in 8.0"

Change-Id: I9a8158113746db9a1edf5d7f62a3aaf24a652143
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
---
 .../src/main/resources/bin/instance                      | 9 ---------
 .../src/main/resources/bin/karaf                         | 9 ---------
 .../src/main/resources/bin/karaf.bat                     | 8 --------
 3 files changed, 26 deletions(-)

diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance
index 3519258be1..b4abff720e 100644
--- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/instance
@@ -255,15 +255,6 @@ setupDefaults() {
 
     #Set the JVM_VENDOR specific JVM flags
     if [ "$JVM_VENDOR" = "SUN" ]; 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
         DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
     elif [ "$JVM_VENDOR" = "IBM" ]; then
         if $os400; then
diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
index 232325ea99..0d9f57e436 100755
--- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf
@@ -279,15 +279,6 @@ setupDefaults() {
 
     #Set the JVM_VENDOR specific JVM flags
     if [ "$JVM_VENDOR" = "SUN" ]; 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
         DEFAULT_JAVA_OPTS="-server $DEFAULT_JAVA_OPTS -Dcom.sun.management.jmxremote"
     elif [ "$JVM_VENDOR" = "IBM" ]; then
         if $os400; then
diff --git a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat
index 3d7ac2d9c1..6627eb4889 100644
--- a/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat
+++ b/karaf/opendaylight-karaf-resources/src/main/resources/bin/karaf.bat
@@ -228,14 +228,6 @@ if not "%ODL_JAVA_SECURITY_PROPERTIES%" == "" (
     set DEFAULT_JAVA_OPTS=-Djava.security.properties="%KARAF_ETC%\odl.java.security" %DEFAULT_JAVA_OPTS%
 )
 
-rem Check some easily accessible MIN/MAX params for JVM mem usage
-if not "%JAVA_PERM_MEM%" == "" (
-    set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:PermSize=%JAVA_PERM_MEM%
-)
-if not "%JAVA_MAX_PERM_MEM%" == "" (
-    set DEFAULT_JAVA_OPTS=%DEFAULT_JAVA_OPTS% -XX:MaxPermSize=%JAVA_MAX_PERM_MEM%
-)
-
 if "%JAVA_OPTS%" == "" set JAVA_OPTS=%DEFAULT_JAVA_OPTS%
 
 if "%EXTRA_JAVA_OPTS%" == "" goto :KARAF_EXTRA_JAVA_OPTS_END
-- 
2.36.6