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/server/org/opends/server/core/DirectoryServer.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/DirectoryServer.java b/opends/src/server/org/opends/server/core/DirectoryServer.java
index 56bf2a4..28c5af7 100644
--- a/opends/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opends/src/server/org/opends/server/core/DirectoryServer.java
@@ -8337,6 +8337,22 @@
ec.finalizeEntryCache();
}
+ // Release exclusive lock held on server.lock file
+ String serverLockFileName = LockFileManager.getServerLockFileName();
+ StringBuilder failureReason = new StringBuilder();
+
+ try {
+ if (!LockFileManager.releaseLock(serverLockFileName,
+ failureReason)) {
+ message = NOTE_SERVER_SHUTDOWN.get(className, failureReason);
+ logError(message);
+ }
+ } catch (Exception e) {
+ if (debugEnabled()) {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+ }
+
// Deregister all workflows.
WorkflowImpl.deregisterAllOnShutdown();
--
Gitblit v1.10.0