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/ui/QuickSetup.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
index 6bd64a8..25eda74 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
@@ -35,6 +35,8 @@
import org.opends.quicksetup.util.ProgressMessageFormatter;
import org.opends.quicksetup.util.HtmlProgressMessageFormatter;
import org.opends.quicksetup.util.BackgroundTask;
+import org.opends.server.util.SetupUtils;
+
import static org.opends.quicksetup.util.Utils.*;
import org.opends.messages.MessageBuilder;
import org.opends.messages.Message;
@@ -403,11 +405,7 @@
pb = new ProcessBuilder(cmd);
}
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 stop the server.
- */
- env.remove("JAVA_BIN");
+ env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
Process process = pb.start();
/**
* Wait for 3 seconds. Assume that if the process has not exited
--
Gitblit v1.10.0