From d36a4757209f5fe3229ebaca7d34a98b3ba83f76 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Tue, 24 Apr 2007 20:25:01 +0000
Subject: [PATCH] fixed problems related to running the upgrader in Windows
---
opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
index 7ebc621..91b6d72 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ServerController.java
@@ -242,6 +242,7 @@
String[] args = new String[argList.size()];
argList.toArray(args);
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
@@ -249,6 +250,12 @@
*/
env.remove("JAVA_BIN");
+ // Upgrader's classpath contains jars located in the temporary
+ // directory that we don't want locked by the directory server
+ // when it starts. Since we're just calling the start-ds script
+ // it will figure out the correct classpath for the server.
+ env.remove("CLASSPATH");
+
try
{
String startedId = getStartedId();
--
Gitblit v1.10.0