From 7854fed0bdef754047ab1cda830729211e5d21e7 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Thu, 14 Jan 2010 22:01:58 +0000
Subject: [PATCH] Fix for issue 4489 (java is not detected even if the JAVA_HOME variable is defined)

---
 opends/resource/bin/_script-util.bat |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/opends/resource/bin/_script-util.bat b/opends/resource/bin/_script-util.bat
index 635cad8..3af240a 100644
--- a/opends/resource/bin/_script-util.bat
+++ b/opends/resource/bin/_script-util.bat
@@ -22,7 +22,7 @@
 rem CDDL HEADER END
 rem
 rem
-rem      Copyright 2008-2009 Sun Microsystems, Inc.
+rem      Copyright 2008-2010 Sun Microsystems, Inc.
 
 set SET_JAVA_HOME_AND_ARGS_DONE=false
 set SET_ENVIRONMENT_VARS_DONE=false
@@ -81,14 +81,14 @@
 
 :setJavaHomeAndArgs
 if "%SET_JAVA_HOME_AND_ARGS_DONE%" == "true" goto prepareCheck
-if not exist "%INSTANCE_ROOT%\lib\set-java-home.bat" goto checkEnvJavaArgs
+if not exist "%INSTANCE_ROOT%\lib\set-java-home.bat" goto checkEnvJavaHome
 call "%INSTANCE_ROOT%\lib\set-java-home.bat"
-if "%OPENDS_JAVA_BIN%" == "" goto checkEnvJavaArgs
+if "%OPENDS_JAVA_BIN%" == "" goto checkEnvJavaHome
 :endJavaHomeAndArgs
 set SET_JAVA_HOME_AND_ARGS_DONE=true
 goto scriptBegin
 
-:checkEnvJavaArgs
+:checkEnvJavaHome
 if "%OPENDS_JAVA_BIN%" == "" goto checkOpenDSJavaHome
 if not exist "%OPENDS_JAVA_BIN%" goto checkOpenDSJavaHome
 goto endJavaHomeAndArgs

--
Gitblit v1.10.0