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