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/BuildInformation.java |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java b/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java
index 6cb72b5..fda36d4 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/BuildInformation.java
@@ -31,6 +31,7 @@
 
 import org.opends.quicksetup.util.Utils;
 import org.opends.server.util.DynamicConstants;
+import org.opends.server.util.SetupUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -95,11 +96,7 @@
     InputStream is = null;
     try {
       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 process = pb.start();
       is = process.getInputStream();
       BufferedReader reader = new BufferedReader(new InputStreamReader(is));

--
Gitblit v1.10.0