tomee git commit: TOMEE-1540 backporting tomee.sh doesn't support missing JAVA_HOME var

[rm...@apache.org]

Repository: tomee
Updated Branches:
  refs/heads/tomee-1.7.x 899ddaa1c -> 86f930d5d


TOMEE-1540 backporting tomee.sh doesn't support missing JAVA_HOME var


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/86f930d5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/86f930d5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/86f930d5

Branch: refs/heads/tomee-1.7.x
Commit: 86f930d5d0dc07e10d97c533a2c7ec3a8107a446
Parents: 899ddaa
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Mon Apr 20 19:33:54 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Mon Apr 20 19:33:54 2015 +0200

----------------------------------------------------------------------
 tomee/apache-tomee/src/main/resources/tomee.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/86f930d5/tomee/apache-tomee/src/main/resources/tomee.sh
----------------------------------------------------------------------
diff --git a/tomee/apache-tomee/src/main/resources/tomee.sh b/tomee/apache-tomee/src/main/resources/tomee.sh
index 4c1c338..3ea5279 100644
--- a/tomee/apache-tomee/src/main/resources/tomee.sh
+++ b/tomee/apache-tomee/src/main/resources/tomee.sh
@@ -62,13 +62,13 @@ PRGDIR=`dirname "$PRG"`
 
 . "$TOMEE_HOME"/bin/setclasspath.sh
 
-if [ -d $JAVA_HOME ]; then
-  JAVA=$JAVA_HOME"/bin/java"
-else
+if [ -z $JAVA_HOME ]; then
   JAVA="java"
+else
+  JAVA=$JAVA_HOME"/bin/java"
 fi
 
-CP=""
+CP="$TOMEE_HOME/lib"
 for i in $TOMEE_HOME/lib/*.jar; do
   CP="$CP:$i"
 done