From 739ae3927ffd599808ea70a386452cbb148de52d Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 30 Jul 2007 12:26:33 +0000
Subject: [PATCH] Partial fix for Issue 2026: installer should ensure 1.5 or later JAVA_HOME setting. Force the processes launched by the installer and the upgrader to use the same JVM as the tools (th is is done by setting the JAVA_HOME environment variable when creating the processes).
---
opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java b/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java
index 7988eeb..25e828d 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/ExternalTools.java
@@ -33,6 +33,7 @@
import java.util.logging.Level;
import java.util.List;
import java.util.ArrayList;
+import java.util.Map;
import java.io.File;
import java.io.IOException;
import java.io.BufferedReader;
@@ -110,6 +111,12 @@
LOG.log(Level.INFO, "Invoking " + Utils.listToString(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 run the command.
+ */
+ env.remove("JAVA_BIN");
Process p = pb.start();
BufferedReader out =
--
Gitblit v1.10.0