From fd123dfd23f241e312dfa5e6430dc52cf4a0a98d 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.)
---
opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java
index 88a60a0..5dccc3d 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java
@@ -38,6 +38,7 @@
import javax.swing.SwingUtilities;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.util.SetupUtils;
import org.opends.admin.ads.util.ApplicationTrustManager;
import org.opends.guitools.statuspanel.event.ServerStatusChangeEvent;
@@ -565,12 +566,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 installer
- * JVM to start the server.
- */
- env.remove("JAVA_BIN");
-
+ env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
try
{
Process process = pb.start();
@@ -683,11 +679,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
{
--
Gitblit v1.10.0