From 313c7ce226afaa79e811d6fa0f5ad8b8a59f0fd5 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 13 Aug 2007 14:48:19 +0000
Subject: [PATCH] Provide a new org.opends.server.util.EmbeddedUtils class that can be used to simplify the process of running the server as an embedded application.  There are methods to start, stop, and restart the server, as well as to determine whether the server is running.  Also, provide a new org.opends.server.types.DirectoryEnvironmentConfig class that can be used to define a number of "environment" properties that provide information about the way in which the server should run.

---
 opends/src/server/org/opends/server/core/LockFileManager.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/LockFileManager.java b/opends/src/server/org/opends/server/core/LockFileManager.java
index 1f3e0d8..5bb1fdd 100644
--- a/opends/src/server/org/opends/server/core/LockFileManager.java
+++ b/opends/src/server/org/opends/server/core/LockFileManager.java
@@ -574,14 +574,9 @@
    */
   public static String getLockDirectoryPath()
   {
-    String lockDirectory = System.getProperty(PROPERTY_LOCK_DIRECTORY);
-    if ((lockDirectory == null) || (lockDirectory.length() == 0))
-    {
-      lockDirectory = DirectoryServer.getServerRoot() + File.separator +
-                      LOCKS_DIRECTORY;
-    }
-
-    return lockDirectory;
+    File lockDirectory =
+              DirectoryServer.getEnvironmentConfig().getLockDirectory();
+    return lockDirectory.getAbsolutePath();
   }
 
 

--
Gitblit v1.10.0