From 0eaee4bea7b7400074cc051eba4e7009e7212547 Mon Sep 17 00:00:00 2001
From: chebrard <chebrard@localhost>
Date: Mon, 16 Mar 2009 16:02:53 +0000
Subject: [PATCH] Fix: 3873: sometimes CLI use java.properties from other CLI
---
opends/src/server/org/opends/server/tools/configurator/CheckInstance.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/configurator/CheckInstance.java b/opends/src/server/org/opends/server/tools/configurator/CheckInstance.java
index 6c4e57b..9d3a227 100644
--- a/opends/src/server/org/opends/server/tools/configurator/CheckInstance.java
+++ b/opends/src/server/org/opends/server/tools/configurator/CheckInstance.java
@@ -154,9 +154,9 @@
}
// Check user
- Installation installation = new Installation(installRootFromSystem,
- instanceRootFromSystem);
- File conf = installation.getCurrentConfigurationFile();
+ File confDir = new File (instanceRootFromSystem,
+ Installation.CONFIG_PATH_RELATIVE);
+ File conf = new File (confDir, Installation.CURRENT_CONFIG_FILE_NAME);
String cmd = null;
Process proc = null;
int exit = 0;
@@ -238,8 +238,7 @@
BuildInformation instanceBi = installBi;
try {
- File bif = new File(installation.getConfigurationDirectory(),
- Installation.BUILDINFO_RELATIVE_PATH);
+ File bif = new File(confDir, Installation.BUILDINFO_RELATIVE_PATH);
if (bif.exists()) {
BufferedReader breader = new BufferedReader(new FileReader(bif));
--
Gitblit v1.10.0