From 2a8f1e37c57ffa47dea764b2e83887d17e18e839 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)
---
opendj-sdk/opends/resource/bin/_script-util.bat | 8 ++++----
opendj-sdk/opends/resource/bin/_script-util.sh | 4 ++--
opendj-sdk/opends/resource/bin/start-ds.bat | 4 +---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/opendj-sdk/opends/resource/bin/_script-util.bat b/opendj-sdk/opends/resource/bin/_script-util.bat
index 635cad8..3af240a 100644
--- a/opendj-sdk/opends/resource/bin/_script-util.bat
+++ b/opendj-sdk/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
diff --git a/opendj-sdk/opends/resource/bin/_script-util.sh b/opendj-sdk/opends/resource/bin/_script-util.sh
index 8ed5972..3eff9cd 100644
--- a/opendj-sdk/opends/resource/bin/_script-util.sh
+++ b/opendj-sdk/opends/resource/bin/_script-util.sh
@@ -23,7 +23,7 @@
# CDDL HEADER END
#
#
-# Copyright 2008-2009 Sun Microsystems, Inc.
+# Copyright 2008-2010 Sun Microsystems, Inc.
#
# Display an error message
@@ -77,7 +77,7 @@
#
test_java_path() {
OPENDS_JAVA_BIN=`which java 2> /dev/null`
- if test ${?} -eq 0
+ if test -f "${OPENDS_JAVA_BIN}"
then
export OPENDS_JAVA_BIN
else
diff --git a/opendj-sdk/opends/resource/bin/start-ds.bat b/opendj-sdk/opends/resource/bin/start-ds.bat
index 7cb457e..61ab3af 100644
--- a/opendj-sdk/opends/resource/bin/start-ds.bat
+++ b/opendj-sdk/opends/resource/bin/start-ds.bat
@@ -23,7 +23,7 @@
rem CDDL HEADER END
rem
rem
-rem Copyright 2006-2009 Sun Microsystems, Inc.
+rem Copyright 2006-2010 Sun Microsystems, Inc.
setlocal
for %%i in (%~sf0) do set DIR_HOME=%%~dPsi..
@@ -55,8 +55,6 @@
echo %SCRIPT%: CLASSPATH=%CLASSPATH% >> %LOG%
-set PATH=%SystemRoot%
-
echo %SCRIPT%: PATH=%PATH% >> %LOG%
"%OPENDS_JAVA_BIN%" -client %SCRIPT_NAME_ARG% org.opends.server.core.DirectoryServer --configClass org.opends.server.extensions.ConfigFileHandler --configFile "%INSTANCE_ROOT%\config\config.ldif" --checkStartability %*
--
Gitblit v1.10.0