From c4bfbbc9e48ec9949bf083e714cd3850433f4ccb Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 13 Jun 2008 11:01:21 +0000
Subject: [PATCH] Fix for issue 3328 (Server is started with options "-client -Xms8m" when started by status-panel)
---
opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java | 5 ++---
opends/src/server/org/opends/server/util/SetupUtils.java | 5 +++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java b/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java
index a2e1847..5a42fc9 100644
--- a/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java
+++ b/opends/src/guitools/org/opends/guitools/statuspanel/StatusPanelController.java
@@ -582,7 +582,7 @@
argList.toArray(args);
ProcessBuilder pb = new ProcessBuilder(args);
Map<String, String> env = pb.environment();
- env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
+ env.remove(SetupUtils.OPENDS_JAVA_ARGS);
try
{
Process process = pb.start();
@@ -696,8 +696,7 @@
argList.toArray(args);
ProcessBuilder pb = new ProcessBuilder(args);
Map<String, String> env = pb.environment();
- env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
-
+ env.remove(SetupUtils.OPENDS_JAVA_ARGS);
try
{
Process process = pb.start();
diff --git a/opends/src/server/org/opends/server/util/SetupUtils.java b/opends/src/server/org/opends/server/util/SetupUtils.java
index 15499d0..83af11b 100644
--- a/opends/src/server/org/opends/server/util/SetupUtils.java
+++ b/opends/src/server/org/opends/server/util/SetupUtils.java
@@ -62,6 +62,11 @@
public static final String OPENDS_JAVA_HOME = "OPENDS_JAVA_HOME";
/**
+ * Specific environment variable used by the scripts to set java arguments.
+ */
+ public static final String OPENDS_JAVA_ARGS = "OPENDS_JAVA_ARGS";
+
+ /**
* Java property used to know which are the jar files that must be downloaded
* lazily. The current code in WebStartDownloader that uses this property
* assumes that the URL are separated with an space.
--
Gitblit v1.10.0