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

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

Author: jiwils
Date: 2010-07-26 01:00:42 -0400 (Mon, 26 Jul 2010)
New Revision: 107077

Modified:
   branches/JBPAPP_5_1/main/src/bin/run.sh
Log:
Fix for JBPAPP-4730.  Use of  for 64bit version check can cause the run.sh script to hang.

Modified: branches/JBPAPP_5_1/main/src/bin/run.sh
===================================================================
--- branches/JBPAPP_5_1/main/src/bin/run.sh	2010-07-26 02:34:48 UTC (rev 107076)
+++ branches/JBPAPP_5_1/main/src/bin/run.sh	2010-07-26 05:00:42 UTC (rev 107077)
@@ -13,7 +13,7 @@
 
 # Set conf if specified, else set to default
 JBOSSCONF="default"
-CONF_SPECIFIED=false 
+CONF_SPECIFIED=false
 
 arg_count=1
 eval SWITCH=\${$arg_count}
@@ -30,7 +30,7 @@
         if [ $? -eq 0 ]; then
             JBOSSCONF=`echo $SWITCH|sed 's/\-\-configuration=//'`
             break
-        fi 
+        fi
 
         arg_count=`expr $arg_count + 1`
         eval SWITCH=\${$arg_count}
@@ -39,7 +39,7 @@
 if [ x${CONF_SPECIFIED} = "xfalse" ]
 then
    set -- "-c" ${JBOSSCONF} $@
-fi 
+fi
 
 # Use the maximum available, or set MAX_FD != -1 to use that
 MAX_FD="maximum"
@@ -219,7 +219,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" -version 2>&1 | $GREP -i 64-bit`
         if [ "x$IS_64_BIT_JVM" != "x" ]; then
             JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/lib64"
         else
@@ -303,13 +303,13 @@
             SIGNAL=`expr $WAIT_STATUS - 128`
             SIGNAL_NAME=`kill -l $SIGNAL`
             echo "*** JBossAS process ($JBOSS_PID) received $SIGNAL_NAME signal ***" >&2
-         fi          
+         fi
       done
       if [ "$WAIT_STATUS" -lt 127 ]; then
          JBOSS_STATUS=$WAIT_STATUS
       else
          JBOSS_STATUS=0
-      fi      
+      fi
       if [ "$JBOSS_STATUS" -ne 10 ]; then
             # Wait for a complete shudown
             wait $JBOSS_PID 2>/dev/null
@@ -318,7 +318,7 @@
    # If restart doesn't work, check you are running JBossAS 4.0.4+
    #    http://jira.jboss.com/jira/browse/JBAS-2483
    # or the following if you're running Red Hat 7.0
-   #    http://developer.java.sun.com/developer/bugParade/bugs/4465334.html   
+   #    http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
    if [ "$JBOSS_STATUS" -eq 10 ]; then
       echo "Restarting JBoss..."
    else