Fix OPENDJ-538. Revert some changes done while fixing OPENDJ-136.

Ludovic Poitou

19.52.2012 52061668ac013292508b6317943fe8f4f919fb3e

Fix OPENDJ-538. Revert some changes done while fixing OPENDJ-136.

 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,