From 0118a87e1e0da7d5cef6dd10dee7d6e70324d649 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 13 Jun 2008 11:16:04 +0000
Subject: [PATCH] Fix for issue 3328 (Server is started with options "-client -Xms8m" when started by status-panel)

---
 opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index 75b174b..afd553c 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -139,6 +139,7 @@
       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();
@@ -311,6 +312,7 @@
       pb.directory(installation.getBinariesDirectory());
       Map<String, String> env = pb.environment();
       env.put(SetupUtils.OPENDS_JAVA_HOME, System.getProperty("java.home"));
+      env.remove(SetupUtils.OPENDS_JAVA_ARGS);
 
       // Upgrader's classpath contains jars located in the temporary
       // directory that we don't want locked by the directory server

--
Gitblit v1.10.0