From 236551ca7ea0528aa6cc63479a84382b915ba66f Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 09 Jul 2013 13:20:37 +0000
Subject: [PATCH] Fix OPENDJ-1067: Tools are not properly picking up OPENDJ_JAVA_HOME variable.

---
 opends/src/server/org/opends/server/tools/JavaPropertiesTool.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/opends/src/server/org/opends/server/tools/JavaPropertiesTool.java b/opends/src/server/org/opends/server/tools/JavaPropertiesTool.java
index d9a0e18..547b07b 100644
--- a/opends/src/server/org/opends/server/tools/JavaPropertiesTool.java
+++ b/opends/src/server/org/opends/server/tools/JavaPropertiesTool.java
@@ -642,7 +642,7 @@
       }
       buf.append(
           "      else"+EOL+
-          "        OPENDJ_JAVA_BIN=\"${OPENDJ_JAVA_HOME}/bin/java\""+EOL+
+          "        OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_HOME}/bin/java\""+EOL+
           "        export OPENDJ_JAVA_BIN"+EOL+
           "      fi"+EOL+
           "    else"+EOL+
@@ -650,7 +650,7 @@
           "      export OPENDJ_JAVA_BIN"+EOL+
           "    fi"+EOL+
           "  else"+EOL+
-          "    OPENDJ_JAVA_BIN=\"${OPENDS_JAVA_HOME}/bin/java\""+EOL+
+          "    OPENDJ_JAVA_BIN=\"${OPENDJ_JAVA_HOME}/bin/java\""+EOL+
           "    export OPENDJ_JAVA_BIN"+EOL+
           "  fi"+EOL+
 

--
Gitblit v1.10.0