From 4e6c2e385283bfa2444d5a5b31e8054d6f3c2537 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Mon, 01 Jan 2007 20:51:56 +0000
Subject: [PATCH] Add two new server properties:

---
 opends/src/server/org/opends/server/core/LockFileManager.java |   31 +++++++++++++++++++++++++------
 1 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/opends/src/server/org/opends/server/core/LockFileManager.java b/opends/src/server/org/opends/server/core/LockFileManager.java
index 7822661..9fcde7e 100644
--- a/opends/src/server/org/opends/server/core/LockFileManager.java
+++ b/opends/src/server/org/opends/server/core/LockFileManager.java
@@ -440,6 +440,29 @@
 
 
   /**
+   * Retrieves the path to the directory that should be used to hold the lock
+   * files.
+   *
+   * @return  The path to the directory that should be used to hold the lock
+   *          files.
+   */
+  public static String getLockDirectoryPath()
+  {
+    assert debugEnter(CLASS_NAME, "getLockFileDirectory");
+
+    String lockDirectory = System.getProperty(PROPERTY_LOCK_DIRECTORY);
+    if ((lockDirectory == null) || (lockDirectory.length() == 0))
+    {
+      lockDirectory = DirectoryServer.getServerRoot() + File.separator +
+                      LOCKS_DIRECTORY;
+    }
+
+    return lockDirectory;
+  }
+
+
+
+  /**
    * Retrieves the filename that should be used for the lock file for the
    * Directory Server instance.
    *
@@ -451,9 +474,7 @@
     assert debugEnter(CLASS_NAME, "getServerLockFileName");
 
     StringBuilder buffer = new StringBuilder();
-    buffer.append(DirectoryServer.getServerRoot());
-    buffer.append(File.separator);
-    buffer.append(LOCKS_DIRECTORY);
+    buffer.append(getLockDirectoryPath());
     buffer.append(File.separator);
     buffer.append(SERVER_LOCK_FILE_NAME);
     buffer.append(LOCK_FILE_SUFFIX);
@@ -479,9 +500,7 @@
                       String.valueOf(backend));
 
     StringBuilder buffer = new StringBuilder();
-    buffer.append(DirectoryServer.getServerRoot());
-    buffer.append(File.separator);
-    buffer.append(LOCKS_DIRECTORY);
+    buffer.append(getLockDirectoryPath());
     buffer.append(File.separator);
     buffer.append(BACKEND_LOCK_FILE_PREFIX);
     buffer.append(backend.getBackendID());

--
Gitblit v1.10.0