From 363fc652bf7a468b4f1fd067af3653c6729e4772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 25 Aug 2016 10:05:15 +0300
Subject: [PATCH] ARTEMIS-698 Remove full path + executability check of java

Fixes issues with systems that have no "which", as well as the fallback
to using plain "java" from PATH.
---
 .../apache/activemq/artemis/cli/commands/bin/artemis | 11 +----------
 artemis-distribution/src/main/resources/bin/artemis  | 12 +-----------
 2 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
index b21e8c83c1f..10da1c9b675 100755
--- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
+++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
@@ -86,19 +86,10 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then
-        JAVACMD=java
-    fi
+    JAVACMD=java
   fi
 fi
 
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
-
 if $cygwin ; then
   JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
   ARTEMIS_HOME=`cygpath --windows "$ARTEMIS_HOME"`
diff --git a/artemis-distribution/src/main/resources/bin/artemis b/artemis-distribution/src/main/resources/bin/artemis
index 43f70a9c01e..9aef5115f02 100755
--- a/artemis-distribution/src/main/resources/bin/artemis
+++ b/artemis-distribution/src/main/resources/bin/artemis
@@ -80,20 +80,10 @@ if [ -z "$JAVACMD" ] ; then
       JAVACMD="$JAVA_HOME/bin/java"
     fi
   else
-    JAVACMD=`which java 2> /dev/null `
-    if [ -z "$JAVACMD" ] ; then
-        JAVACMD=java
-    fi
+    JAVACMD=java
   fi
 fi
 
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly."
-  echo "  We cannot execute $JAVACMD"
-  exit 1
-fi
-
-
 if $cygwin ; then
   JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
   ARTEMIS_HOME=`cygpath --windows "$ARTEMIS_HOME"`