From fa1156092eb341850c207742d4ac5a3677c97d00 Mon Sep 17 00:00:00 2001 From: Rajani Karuturi Date: Fri, 12 Sep 2014 14:56:48 +0530 Subject: [PATCH] CLOUDSTACK-6926 setting java_home from installed java changed the order of preference to check for java first. Usage server rpm installs JRE 1.7. In the case where JDK 1.6 is already installed, java version would be 1.7 but, javac would be 1.6 If javac is given preference, usage server fails to start in this case. --- packaging/centos63/cloud-usage.rc | 8 ++++---- packaging/debian/init/cloud-usage | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc index a03df5be5f6..9e3d6d6b2a8 100755 --- a/packaging/centos63/cloud-usage.rc +++ b/packaging/centos63/cloud-usage.rc @@ -52,12 +52,12 @@ setJavaHome() { return fi - # try javac first - java=$(which javac 2>/dev/null || :) + # try java first + java=$(which java 2>/dev/null || :) - # try java if javac is not found + # try javac if java is not found if [ -z "$java" ] ; then - java=$(which java 2>/dev/null || :) + java=$(which javac 2>/dev/null || :) fi if [ -n "$java" ] ; then diff --git a/packaging/debian/init/cloud-usage b/packaging/debian/init/cloud-usage index fcede4fc139..d1939180093 100755 --- a/packaging/debian/init/cloud-usage +++ b/packaging/debian/init/cloud-usage @@ -48,12 +48,12 @@ setJavaHome() { return fi - # try javac first - java=$(which javac 2>/dev/null || :) + # try java first + java=$(which java 2>/dev/null || :) - # try java if javac is not found + # try javac if java is not found if [ -z "$java" ] ; then - java=$(which java 2>/dev/null || :) + java=$(which javac 2>/dev/null || :) fi if [ -n "$java" ] ; then