[jboss-cvs] JBossAS SVN: r107078 - branches/JBPAPP_5_1/main/src/bin.

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

Author: jiwils
Date: 2010-07-26 01:45:48 -0400 (Mon, 26 Jul 2010)
New Revision: 107078

Modified:
   branches/JBPAPP_5_1/main/src/bin/run.sh
Log:
Fix for JBPAPP-4730 to incorporate the full change from JBAS-8063.

Modified: branches/JBPAPP_5_1/main/src/bin/run.sh
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/run.sh	2010-07-26 05:00:42 UTC (rev 107077)
+++ branches/JBPAPP_5_1/main/src/bin/run.sh	2010-07-26 05:45:48 UTC (rev 107078)
@@ -177,27 +177,37 @@
     JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JAVAC_JAR_FILE"
 fi
 
+# 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
     if [ "x$HAS_HOTSPOT" != "x" -o "x$HAS_OPENJDK" != "x" ]; then
-	# MacOS does not support -server flag
-	if [ "$darwin" != "true" ]; then
-	    JAVA_OPTS="-server $JAVA_OPTS"
-	fi
+        # 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 Native library path
@@ -219,7 +229,7 @@
         export PATH="$JBOSS_NATIVE_DIR:$PATH"
         JBOSS_NATIVE_LIBPATH=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
     else
-        IS_64_BIT_JVM=`"$JAVA" -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