From e7e6df7896a5454f8a30d021d95de7e536191347 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Tue, 19 Feb 2008 08:42:15 +0000
Subject: [PATCH] Fix for issue 2969 (In some cases the arguments set for offline operations (import-ldif, export-ldif) are the ones of the online mode)

---
 opends/resource/bin/_mixed-script.bat |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/opends/resource/bin/_mixed-script.bat b/opends/resource/bin/_mixed-script.bat
index 3d5085a..f4334d3 100644
--- a/opends/resource/bin/_mixed-script.bat
+++ b/opends/resource/bin/_mixed-script.bat
@@ -37,6 +37,11 @@
 set OLD_SCRIPT_NAME=%SCRIPT_NAME%
 set SCRIPT_NAME=%OLD_SCRIPT_NAME%.online
 
+rem We keep this values to reset the environment before calling _script-util.bat.
+set ORIGINAL_JAVA_ARGS=%OPENDS_JAVA_ARGS%
+set ORIGINAL_JAVA_HOME=%OPENDS_JAVA_HOME%
+set ORIGINAL_JAVA_BIN=%OPENDS_JAVA_BIN%
+
 set SCRIPT_UTIL_CMD=set-full-environment
 call "%INSTANCE_ROOT%\lib\_script-util.bat"
 if NOT %errorlevel% == 0 exit /B %errorlevel%
@@ -63,6 +68,13 @@
 :launchoffline
 set SCRIPT_NAME=%OLD_SCRIPT_NAME%.offline
 
+rem Set the original values that the user had on the environment in order to be
+rem sure that the script works with the proper arguments (in particular
+rem if the user specified not to overwrite the environment).
+set OPENDS_JAVA_ARGS=%ORIGINAL_JAVA_ARGS%
+set OPENDS_JAVA_HOME=%ORIGINAL_JAVA_HOME%
+set OPENDS_JAVA_BIN=%ORIGINAL_JAVA_BIN%
+
 set SCRIPT_UTIL_CMD=set-full-environment
 call "%INSTANCE_ROOT%\lib\_script-util.bat"
 if NOT %errorlevel% == 0 exit /B %errorlevel%

--
Gitblit v1.10.0