You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@activemq.apache.org by gt...@apache.org on 2010/09/13 22:45:36 UTC

svn commit: r996684 - /activemq/trunk/assembly/src/release/bin/activemq

Author: gtully
Date: Mon Sep 13 20:45:35 2010
New Revision: 996684

URL: http://svn.apache.org/viewvc?rev=996684&view=rev
Log:
apply patch from https://issues.apache.org/activemq/browse/AMQ-2912

Modified:
    activemq/trunk/assembly/src/release/bin/activemq

Modified: activemq/trunk/assembly/src/release/bin/activemq
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/bin/activemq?rev=996684&r1=996683&r2=996684&view=diff
==============================================================================
--- activemq/trunk/assembly/src/release/bin/activemq (original)
+++ activemq/trunk/assembly/src/release/bin/activemq Mon Sep 13 20:45:35 2010
@@ -250,7 +250,7 @@ if [ "$OSTYPE" = "cygwin" ]; then
 fi
 
 # Detect the location of the java binary
-if [ -z "$JAVACMD" ] ; then
+if [ -z "$JAVACMD" ] || [ "$JAVACMD" = "auto" ] ; then
   if [ -n "$JAVA_HOME"  ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
       # IBM's JDK on AIX uses strange locations for the executables