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/ServerController.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index 820a906..f3d4c99 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -34,6 +34,7 @@
import org.opends.quicksetup.*;
import static org.opends.quicksetup.util.Utils.*;
import org.opends.quicksetup.installer.InstallerHelper;
+import org.opends.server.util.SetupUtils;
import javax.naming.NamingException;
import java.util.ArrayList;
@@ -128,11 +129,7 @@
argList.toArray(args);
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 stop the server.
- */
- env.remove("JAVA_BIN");
+ env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
try {
Process process = pb.start();
@@ -294,11 +291,7 @@
ProcessBuilder pb = new ProcessBuilder(args);
pb.directory(installation.getBinariesDirectory());
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 installer
- * JVM to start the server.
- */
- env.remove("JAVA_BIN");
+ env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
// Upgrader's classpath contains jars located in the temporary
// directory that we don't want locked by the directory server
--
Gitblit v1.10.0