From 27da77b7141a2a8d79580baeba11052a154bb50b Mon Sep 17 00:00:00 2001
From: Prashant Sharma <prashant.s@imaginea.com>
Date: Tue, 4 Mar 2014 11:35:28 +0530
Subject: [PATCH] Move java home check after process args.

---
 sbt/sbt-launch-lib.bash | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/sbt/sbt-launch-lib.bash b/sbt/sbt-launch-lib.bash
index 00a6b41013e5f..e42e7961cb307 100755
--- a/sbt/sbt-launch-lib.bash
+++ b/sbt/sbt-launch-lib.bash
@@ -17,14 +17,6 @@ declare -a java_args
 declare -a scalac_args
 declare -a sbt_commands
 
-if test -x "$JAVA_HOME/bin/java"; then
-    echo -e "Using $JAVA_HOME as default JAVA_HOME."
-    echo "Note, this will be overridden by -java-home if it is set."
-    declare java_cmd="$JAVA_HOME/bin/java"
-else
-    declare java_cmd=java
-fi
-
 echoerr () {
   echo 1>&2 "$@"
 }
@@ -165,6 +157,17 @@ run() {
   process_args "$@"
   set -- "${residual_args[@]}"
   argumentCount=$#
+  
+  
+  if test -x "$JAVA_HOME/bin/java"; then
+      echo -e "Using $JAVA_HOME as JAVA_HOME."
+      declare java_cmd="$JAVA_HOME/bin/java"
+  elif test -z "$JAVA_HOME"; then
+      declare java_cmd=java
+  else
+      echo -e "JAVA_HOME:$JAVA_HOME points to invalid jdk installation."
+      exit 123
+  fi
 
   # run sbt
   execRunner "$java_cmd" \