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

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

Author: mladen.turk at jboss.com
Date: 2009-09-14 03:08:37 -0400 (Mon, 14 Sep 2009)
New Revision: 93447

Modified:
   branches/JBPAPP_5_0/main/src/bin/run.sh
Log:
Fix JBAS-7239 by using the merged LD_LIBRARY_PATH as java.library.path instead just using JBOSS_NATIVE_DIR

Modified: branches/JBPAPP_5_0/main/src/bin/run.sh
===================================================================
--- branches/JBPAPP_5_0/main/src/bin/run.sh	2009-09-14 07:06:53 UTC (rev 93446)
+++ branches/JBPAPP_5_0/main/src/bin/run.sh	2009-09-14 07:08:37 UTC (rev 93447)
@@ -41,7 +41,7 @@
     Darwin*)
         darwin=true
         ;;
-        
+
     Linux)
         linux=true
         ;;
@@ -157,7 +157,7 @@
     fi
 
     # Enable -server if we have Hotspot or OpenJDK, unless we can't
-    if [ "x$HAS_HOTSPOT" != "x" -o "x$HAS_OPENJDK" != "x" ]; then 
+    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"
@@ -180,7 +180,7 @@
     if $cygwin; then
         JBOSS_NATIVE_DIR="$JBOSS_NATIVE_DIR/bin"
         export PATH="$JBOSS_NATIVE_DIR:$PATH"
-        JBOSS_NATIVE_DIR=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
+        JBOSS_NATIVE_LIBPATH=`cygpath --path --windows "$JBOSS_NATIVE_DIR"`
     else
         IS_64_BIT_JVM=`"$JAVA" $JAVA_OPTS -version 2>&1 | $GREP -i 64-bit`
         if [ "x$IS_64_BIT_JVM" != "x" ]; then
@@ -194,11 +194,12 @@
           LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH"
         fi
         export LD_LIBRARY_PATH
+        JBOSS_NATIVE_LIBPATH=$LD_LIBRARY_PATH
     fi
     if [ "x$JAVA_OPTS" = "x" ]; then
-        JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR"
+        JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_LIBPATH"
     else
-        JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR"
+        JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_LIBPATH"
     fi
 fi
 
@@ -262,18 +263,18 @@
             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
    fi
    # 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