You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/09/12 11:48:13 UTC
git commit: updated refs/heads/master to fa11560
Repository: cloudstack
Updated Branches:
refs/heads/master 283666b03 -> fa1156092
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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa115609
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa115609
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa115609
Branch: refs/heads/master
Commit: fa1156092eb341850c207742d4ac5a3677c97d00
Parents: 283666b
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Fri Sep 12 14:56:48 2014 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Fri Sep 12 15:17:10 2014 +0530
----------------------------------------------------------------------
packaging/centos63/cloud-usage.rc | 8 ++++----
packaging/debian/init/cloud-usage | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa115609/packaging/centos63/cloud-usage.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc
index a03df5b..9e3d6d6 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa115609/packaging/debian/init/cloud-usage
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-usage b/packaging/debian/init/cloud-usage
index fcede4f..d193918 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