git commit: updated refs/heads/master to 449d123

[we...@apache.org]

Repository: cloudstack
Updated Branches:
  refs/heads/master 34e8483e8 -> 449d123ce


Remove error message when start management server if JAVA_HOME is not set


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/449d123c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/449d123c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/449d123c

Branch: refs/heads/master
Commit: 449d123ce73393d79467314446fb50cc06f957d7
Parents: 34e8483
Author: Wei Zhou <w....@tech.leaseweb.com>
Authored: Mon Dec 1 13:25:00 2014 +0100
Committer: Wei Zhou <w....@tech.leaseweb.com>
Committed: Mon Dec 1 13:25:00 2014 +0100

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/449d123c/client/tomcatconf/classpath.conf.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in
index bffbc39..e2c5da4 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