From 449d123ce73393d79467314446fb50cc06f957d7 Mon Sep 17 00:00:00 2001
From: Wei Zhou <w.zhou@tech.leaseweb.com>
Date: Mon, 1 Dec 2014 13:25:00 +0100
Subject: [PATCH] Remove error message when start management server if
 JAVA_HOME is not set

---
 client/tomcatconf/classpath.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in
index bffbc39898c..e2c5da49a22 100644
--- a/client/tomcatconf/classpath.conf.in
+++ b/client/tomcatconf/classpath.conf.in
@@ -34,7 +34,7 @@ for vendorconf in "@MSCONF@"/vendor/* ; do
 	CLASSPATH=$vendorconf:$CLASSPATH
 done
 export CLASSPATH
-if   [[ ! -d "$JAVA_HOME" && -d /usr/lib/jvm/jre-1.7.0 ]]; then
+if ([ -z "$JAVA_HOME" ] || [ ! -d "$JAVA_HOME" ]) && [ -d /usr/lib/jvm/jre-1.7.0 ]; then
      export JAVA_HOME=/usr/lib/jvm/jre-1.7.0
 fi
 PATH=$JAVA_HOME/bin:/sbin:/usr/sbin:$PATH