[jboss-cvs] JBossAS SVN: r90424 - branches/JBPAPP_5_0/main/src/bin.

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

Author: permaine
Date: 2009-06-18 09:12:45 -0400 (Thu, 18 Jun 2009)
New Revision: 90424

Modified:
   branches/JBPAPP_5_0/main/src/bin/run.sh
Log:
JBPAPP-1808 run.sh check for -server flag does not include logic for evaluating if JVM is OpenJDK

Modified: branches/JBPAPP_5_0/main/src/bin/run.sh
===================================================================
--- branches/JBPAPP_5_0/main/src/bin/run.sh	2009-06-18 13:12:34 UTC (rev 90423)
+++ branches/JBPAPP_5_0/main/src/bin/run.sh	2009-06-18 13:12:45 UTC (rev 90424)
@@ -151,8 +151,13 @@
 	HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
     fi
 
-    # Enable -server if we have Hotspot, unless we can't
-    if [ "x$HAS_HOTSPOT" != "x" ]; then
+    # Check for OpenJDK JVM w/server support
+    if [ "x$HAS_OPENJDK_" = "x" ]; then
+        HAS_OPENJDK=`"$JAVA" -version 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"