From 69287099bab9640465cb18ef4006252d05a33e5d 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.)
---
opends/src/server/org/opends/server/tools/CreateRCScript.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/CreateRCScript.java b/opends/src/server/org/opends/server/tools/CreateRCScript.java
index b1689cf..40a1789 100644
--- a/opends/src/server/org/opends/server/tools/CreateRCScript.java
+++ b/opends/src/server/org/opends/server/tools/CreateRCScript.java
@@ -39,6 +39,7 @@
import org.opends.server.types.NullOutputStream;
import org.opends.server.types.OperatingSystem;
import org.opends.server.util.EmbeddedUtils;
+import org.opends.server.util.SetupUtils;
import org.opends.server.util.args.ArgumentParser;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
@@ -212,7 +213,11 @@
}
else
{
- javaHomeDir = System.getenv("JAVA_HOME");
+ javaHomeDir = System.getenv(SetupUtils.OPENDS_JAVA_HOME);
+ if (javaHomeDir == null)
+ {
+ javaHomeDir = System.getenv("JAVA_HOME");
+ }
if (javaHomeDir == null)
{
javaHomeDir = System.getProperty("java.home");
@@ -250,8 +255,8 @@
w.println();
w.println("# Specify the path to the Java installation to use");
- w.println("JAVA_HOME=\"" + javaHomeDir + "\"");
- w.println("export JAVA_HOME");
+ w.println("OPENDS_JAVA_HOME=\"" + javaHomeDir + "\"");
+ w.println("export OPENDS_JAVA_HOME");
w.println();
if (javaArgs.isPresent())
--
Gitblit v1.10.0