From 39cfce287b545fa9642fd62dd8cac6ca6f2d9d18 Mon Sep 17 00:00:00 2001
From: Gary Tully <gtully@apache.org>
Date: Mon, 13 Sep 2010 20:45:35 +0000
Subject: [PATCH] apply patch from
 https://issues.apache.org/activemq/browse/AMQ-2912

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@996684 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/src/release/bin/activemq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index b9e5b0622e..21748f11b8 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -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