update startup.sh & upgrade oracle jdbc to support 12c

xiaoshizijiayou · Apr 19, 2018 · a0b9eb4 · a0b9eb4
1 parent 45519e9
commit a0b9eb4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/lib/ojdbc14-10.2.0.3.0.jar b/lib/ojdbc14-10.2.0.3.0.jar
diff --git a/lib/ojdbc6.jar b/lib/ojdbc6.jar
diff --git a/manager/deployer/src/main/bin/startup.sh b/manager/deployer/src/main/bin/startup.sh
@@ -73,7 +73,7 @@ in
 esac
 
 
-str=`file $JAVA_HOME/bin/java | grep 64-bit`
+str=`file $JAVA | grep 64-bit`
 if [ -n "$str" ]; then
 	JAVA_OPTS="-server -Xms2048m -Xmx3072m -Xmn1024m -XX:SurvivorRatio=2 -XX:PermSize=96m -XX:MaxPermSize=256m -Xss256k -XX:-UseAdaptiveSizePolicy -XX:MaxTenuringThreshold=15 -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError"
 else

diff --git a/node/deployer/src/main/bin/startup.sh b/node/deployer/src/main/bin/startup.sh
@@ -93,7 +93,7 @@ in
 	exit;;
 esac
 
-str=`file $JAVA_HOME/bin/java | grep 64-bit`
+str=`file $JAVA | grep 64-bit`
 if [ -n "$str" ]; then
 	JAVA_OPTS="-server -Xms2048m -Xmx3072m -Xmn1024m -XX:SurvivorRatio=2 -XX:PermSize=96m -XX:MaxPermSize=256m -Xss256k -XX:-UseAdaptiveSizePolicy -XX:MaxTenuringThreshold=15 -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:+HeapDumpOnOutOfMemoryError"
 else