Repository: cloudstack Updated Branches: refs/heads/master 6f7c4863a -> df198d07e
CLOUDSTACK-7474:Failed to start MS with java7 version mismatch error Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df198d07 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df198d07 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df198d07 Branch: refs/heads/master Commit: df198d07e1eff2a6aff2891a1e8566329339a7fd Parents: 6f7c486 Author: rayeesn <raye...@citrix.com> Authored: Tue Sep 2 16:32:22 2014 -0700 Committer: Frank.Zhang <frank.zh...@citrix.com> Committed: Thu Sep 4 10:25:36 2014 -0700 ---------------------------------------------------------------------- client/tomcatconf/classpath.conf.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df198d07/client/tomcatconf/classpath.conf.in ---------------------------------------------------------------------- diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in index 3ae0fb4..bffbc39 100644 --- a/client/tomcatconf/classpath.conf.in +++ b/client/tomcatconf/classpath.conf.in @@ -34,5 +34,8 @@ for vendorconf in "@MSCONF@"/vendor/* ; do CLASSPATH=$vendorconf:$CLASSPATH done export CLASSPATH -PATH=/sbin:/usr/sbin:$PATH +if [[ ! -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 export PATH
