From d55df2366f9f3af5b19409894dd2c521350886d8 Mon Sep 17 00:00:00 2001
From: German Parente <cgerman.parente@gmail.com>
Date: Tue, 27 Mar 2012 10:14:03 +0000
Subject: [PATCH] Fix for OPENDJ-136: On Windows, upgrade fails with NPE during Verify phase (Note: this fixes also OPENDJ-134 and OPENDJ-135
---
opends/src/quicksetup/org/opends/quicksetup/Status.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/Status.java b/opends/src/quicksetup/org/opends/quicksetup/Status.java
index daa03a0..6c1a91a 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/Status.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/Status.java
@@ -95,10 +95,7 @@
*/
public boolean isServerRunning() {
boolean isServerRunning;
- String lockFileName = SERVER_LOCK_FILE_NAME + LOCK_FILE_SUFFIX;
- String lockFile =
- Utils.getPath(new File(installation.getLocksDirectory(),
- lockFileName));
+ String lockFile = LockFileManager.getServerLockFileName();
StringBuilder failureReason = new StringBuilder();
try {
if (LockFileManager.acquireExclusiveLock(lockFile,
--
Gitblit v1.10.0