[jboss-cvs] JBossAS SVN: r106046 - trunk/main/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2010-06-15 06:08:41 -0400 (Tue, 15 Jun 2010)
New Revision: 106046

Modified:
   trunk/main/src/bin/run.sh
Log:
JBAS-8063: Do not pass directly JAVA_OPTS when checking JVM version

JAVA_OPTS can contain agentlib params that can cause JVM to hand during
-version check. Make sure to extract JVM mode params from JAVA_OPTS into
the separate variable. The params passed to version check will be
-server, -d32 and -d64 only

Modified: trunk/main/src/bin/run.sh
===================================================================
--- trunk/main/src/bin/run.sh	2010-06-15 06:22:27 UTC (rev 106045)
+++ trunk/main/src/bin/run.sh	2010-06-15 10:08:41 UTC (rev 106046)
@@ -133,18 +133,25 @@
 JBOSS_CLASSPATH="${JBOSS_CLASSPATH:-$JBOSS_BOOT_CLASSPATH}"
 JBOSS_CLASSPATH="$JBOSS_CLASSPATH${JAVAC_JAR_FILE:+:$JAVAC_JAR_FILE}"
 
+# Check for -d32/-d64 in JAVA_OPTS
+JVM_OPTVERSION="-version"
+JVM_D64_OPTION=`echo $JAVA_OPTS | $GREP "\-d64"`
+JVM_D32_OPTION=`echo $JAVA_OPTS | $GREP "\-d32"`
+test "x$JVM_D64_OPTION" != "x" && JVM_OPTVERSION="-d64 $JVM_OPTVERSION"
+test "x$JVM_D32_OPTION" != "x" && JVM_OPTVERSION="-d32 $JVM_OPTVERSION"
+
 # If -server not set in JAVA_OPTS, set it, if supported
 SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
 if [ "x$SERVER_SET" = "x" ]; then
 
     # Check for SUN(tm) JVM w/ HotSpot support
     if [ "x$HAS_HOTSPOT" = "x" ]; then
-    HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
+        HAS_HOTSPOT=`"$JAVA" $JVM_OPTVERSION -version 2>&1 | $GREP -i HotSpot`
     fi
 
     # Check for OpenJDK JVM w/server support
     if [ "x$HAS_OPENJDK_" = "x" ]; then
-        HAS_OPENJDK=`"$JAVA" -version 2>&1 | $GREP -i OpenJDK`
+        HAS_OPENJDK=`"$JAVA" $JVM_OPTVERSION 2>&1 | $GREP -i OpenJDK`
     fi
 
     # Enable -server if we have Hotspot or OpenJDK, unless we can't
@@ -152,8 +159,11 @@
         # MacOS does not support -server flag
         if [ "$darwin" != "true" ]; then
             JAVA_OPTS="-server $JAVA_OPTS"
+            JVM_OPTVERSION="-server $JVM_OPTVERSION"
         fi
     fi
+else
+    JVM_OPTVERSION="-server $JVM_OPTVERSION"
 fi
 
 # Setup JBoss specific properties
@@ -181,7 +191,7 @@
         export PATH="$JBOSS_NATIVE_DIR:$PATH"
         JBOSS_NATIVE_LIBPATH=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
     else
-        IS_64_BIT_JVM=`"$JAVA" $JAVA_OPTS -version 2>&1 | $GREP -i 64-bit`
+        IS_64_BIT_JVM=`"$JAVA" $JVM_OPTVERSION 2>&1 | $GREP -i 64-bit`
         if [ "x$IS_64_BIT_JVM" != "x" ]; then
             JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64"
         else