From df198d07e1eff2a6aff2891a1e8566329339a7fd Mon Sep 17 00:00:00 2001
From: rayeesn <rayeesn@citrix.com>
Date: Tue, 2 Sep 2014 16:32:22 -0700
Subject: [PATCH] CLOUDSTACK-7474:Failed to start MS with java7 version
 mismatch error

---
 client/tomcatconf/classpath.conf.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/tomcatconf/classpath.conf.in b/client/tomcatconf/classpath.conf.in
index 3ae0fb4d778..bffbc39898c 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