From 69287099bab9640465cb18ef4006252d05a33e5d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 28 Sep 2007 19:50:40 +0000
Subject: [PATCH] Fix for issue 2035 (Use OpenDS specific environment variables to determine the JVM to be used.)

---
 opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java b/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java
index 1eb0f7d..9d220d2 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java
@@ -29,6 +29,7 @@
 import org.opends.messages.Message;
 
 import org.opends.quicksetup.Installation;
+import org.opends.server.util.SetupUtils;
 
 import java.util.logging.Logger;
 import java.util.logging.Level;
@@ -113,11 +114,8 @@
 
     ProcessBuilder pb = new ProcessBuilder(args);
     Map<String, String> env = pb.environment();
-    env.put("JAVA_HOME", System.getProperty("java.home"));
-    /* Remove JAVA_BIN to be sure that we use the JVM running the
-     * uninstaller JVM to run the command.
-     */
-    env.remove("JAVA_BIN");
+    env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
+
     Process p = pb.start();
 
     BufferedReader out =

--
Gitblit v1.10.0