From dffcd320297e23f6d95dad4c7b08a2c0a9c1893a Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 03 Mar 2008 16:48:45 +0000
Subject: [PATCH] Fix for issue 2998 (Command ./bin/create-rc-script should not hard-code the OPENDS_JAVA_HOME in the script)
---
opends/src/server/org/opends/server/tools/CreateRCScript.java | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/CreateRCScript.java b/opends/src/server/org/opends/server/tools/CreateRCScript.java
index a8a2f9a..7221a70 100644
--- a/opends/src/server/org/opends/server/tools/CreateRCScript.java
+++ b/opends/src/server/org/opends/server/tools/CreateRCScript.java
@@ -218,14 +218,6 @@
else
{
javaHomeDir = System.getenv(SetupUtils.OPENDS_JAVA_HOME);
- if (javaHomeDir == null)
- {
- javaHomeDir = System.getenv("JAVA_HOME");
- }
- if (javaHomeDir == null)
- {
- javaHomeDir = System.getProperty("java.home");
- }
}
@@ -258,16 +250,19 @@
w.println("export INSTANCE_ROOT");
w.println();
- w.println("# Specify the path to the Java installation to use");
- w.println("OPENDS_JAVA_HOME=\"" + javaHomeDir + "\"");
- w.println("export OPENDS_JAVA_HOME");
- w.println();
+ if (javaHomeDir != null)
+ {
+ w.println("# Specify the path to the Java installation to use");
+ w.println("OPENDS_JAVA_HOME=\"" + javaHomeDir + "\"");
+ w.println("export OPENDS_JAVA_HOME");
+ w.println();
+ }
if (javaArgs.isPresent())
{
w.println("# Specify arguments that should be provided to the JVM");
- w.println("JAVA_ARGS=\"" + javaArgs.getValue() + "\"");
- w.println("export JAVA_ARGS");
+ w.println("OPENDS_JAVA_ARGS=\"" + javaArgs.getValue() + "\"");
+ w.println("export OPENDS_JAVA_ARGS");
w.println();
}
--
Gitblit v1.10.0