Fix for OPENDJ-136: On Windows, upgrade fails with NPE during Verify phase ...

German Parente

27.14.2012 d55df2366f9f3af5b19409894dd2c521350886d8

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

@@ -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,

 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();