From 52061668ac013292508b6317943fe8f4f919fb3e Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 19 Jul 2012 08:52:00 +0000
Subject: [PATCH] Fix OPENDJ-538. Revert some changes done while fixing OPENDJ-136.
---
opends/src/quicksetup/org/opends/quicksetup/Status.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Status.java b/opends/src/quicksetup/org/opends/quicksetup/Status.java
index 7176cfe..daa03a0 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Status.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Status.java
@@ -28,7 +28,10 @@
package org.opends.quicksetup;
+import static org.opends.server.util.ServerConstants.SERVER_LOCK_FILE_NAME;
+import static org.opends.server.util.ServerConstants.LOCK_FILE_SUFFIX;
import org.opends.server.core.LockFileManager;
+import org.opends.quicksetup.util.Utils;
import java.io.File;
@@ -92,7 +95,10 @@
*/
public boolean isServerRunning() {
boolean isServerRunning;
- String lockFile = LockFileManager.getServerLockFileName();
+ String lockFileName = SERVER_LOCK_FILE_NAME + LOCK_FILE_SUFFIX;
+ String lockFile =
+ Utils.getPath(new File(installation.getLocksDirectory(),
+ lockFileName));
StringBuilder failureReason = new StringBuilder();
try {
if (LockFileManager.acquireExclusiveLock(lockFile,
--
Gitblit v1.10.0