From 7085864f2107cfb40e7947cd41f4827b11b6e45d Mon Sep 17 00:00:00 2001
From: lutoff <lutoff@localhost>
Date: Fri, 21 Sep 2007 09:14:09 +0000
Subject: [PATCH] Bug Fix: server root directory should be get with 'standard' feature Code optimization in file check
---
opends/src/server/org/opends/server/util/args/ArgumentParser.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/opends/src/server/org/opends/server/util/args/ArgumentParser.java b/opends/src/server/org/opends/server/util/args/ArgumentParser.java
index 4b2b5e9..7495b99 100644
--- a/opends/src/server/org/opends/server/util/args/ArgumentParser.java
+++ b/opends/src/server/org/opends/server/util/args/ArgumentParser.java
@@ -1083,7 +1083,7 @@
if (propertiesFilePath == null)
{
// check "Opends instance"/config directory
- String instanceDir = System.getProperty(PROPERTY_SERVER_ROOT);
+ String instanceDir = DirectoryServer.getServerRoot();
propertiesFilePath = findPropertiesFile(instanceDir+ File.separator
+ "config");
}
@@ -1150,18 +1150,9 @@
*/
private String findPropertiesFile(String directory)
{
- // Check directory
- File dir = new File(directory);
- if (! dir.exists())
- {
- return null;
- }
-
// Look for the tools properties file
- String path = directory + File.separator
- + DEFAULT_OPENDS_PROPERTIES_FILE_NAME
- + DEFAULT_OPENDS_PROPERTIES_FILE_EXTENSION;
- File f = new File(path);
+ File f = new File(directory,DEFAULT_OPENDS_PROPERTIES_FILE_NAME
+ + DEFAULT_OPENDS_PROPERTIES_FILE_EXTENSION);
if (f.exists() && f.canRead())
{
return f.getAbsolutePath();
--
Gitblit v1.10.0