From 4553955a315e7e5d43ebb6451ae7078e6f04553f Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 07 Mar 2013 09:51:12 +0000
Subject: [PATCH] Minor fix about style and typos.
---
opends/src/server/org/opends/server/tasks/RebuildTask.java | 75 +++++++++++++++++++------------------
1 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/opends/src/server/org/opends/server/tasks/RebuildTask.java b/opends/src/server/org/opends/server/tasks/RebuildTask.java
index dd7f71f..4fe886e 100644
--- a/opends/src/server/org/opends/server/tasks/RebuildTask.java
+++ b/opends/src/server/org/opends/server/tasks/RebuildTask.java
@@ -26,6 +26,7 @@
* Portions copyright 2012-2013 ForgeRock AS.
*/
package org.opends.server.tasks;
+
import org.opends.messages.Message;
import org.opends.messages.TaskMessages;
@@ -41,7 +42,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
-
import org.opends.server.types.Operation;
import org.opends.server.types.Privilege;
import org.opends.server.types.ResultCode;
@@ -58,13 +58,12 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.config.ConfigConstants.*;
-
import java.util.List;
import java.util.ArrayList;
/**
- * This class provides an implementation of a Directory Server task that can
- * be used to rebuild indexes in the JEB backend..
+ * This class provides an implementation of a Directory Server task that can be
+ * used to rebuild indexes in the JEB backend..
*/
public class RebuildTask extends Task
{
@@ -82,14 +81,16 @@
/**
* {@inheritDoc}
*/
- public Message getDisplayName() {
+ public Message getDisplayName()
+ {
return TaskMessages.INFO_TASK_REBUILD_NAME.get();
}
/**
* {@inheritDoc}
*/
- @Override public void initializeTask() throws DirectoryException
+ @Override
+ public void initializeTask() throws DirectoryException
{
// If the client connection is available, then make sure the associated
// client has the INDEX_REBUILD privilege.
@@ -98,15 +99,14 @@
if (operation != null)
{
ClientConnection clientConnection = operation.getClientConnection();
- if (! clientConnection.hasPrivilege(Privilege.LDIF_IMPORT, operation))
+ if (!clientConnection.hasPrivilege(Privilege.LDIF_IMPORT, operation))
{
Message message = ERR_TASK_INDEXREBUILD_INSUFFICIENT_PRIVILEGES.get();
throw new DirectoryException(ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
- message);
+ message);
}
}
-
Entry taskEntry = getTaskEntry();
AttributeType typeBaseDN;
@@ -114,12 +114,9 @@
AttributeType typeTmpDirectory;
AttributeType clearDegradedState;
- typeBaseDN =
- getAttributeType(ATTR_REBUILD_BASE_DN, true);
- typeIndex =
- getAttributeType(ATTR_REBUILD_INDEX, true);
- typeTmpDirectory =
- getAttributeType(ATTR_REBUILD_TMP_DIRECTORY, true);
+ typeBaseDN = getAttributeType(ATTR_REBUILD_BASE_DN, true);
+ typeIndex = getAttributeType(ATTR_REBUILD_INDEX, true);
+ typeTmpDirectory = getAttributeType(ATTR_REBUILD_TMP_DIRECTORY, true);
clearDegradedState =
getAttributeType(ATTR_REBUILD_INDEX_CLEARDEGRADEDSTATE, true);
@@ -132,9 +129,9 @@
indexes = TaskUtils.getMultiValueString(attrList);
rebuildMode = getRebuildMode(indexes);
- if(rebuildMode != RebuildMode.USER_DEFINED)
+ if (rebuildMode != RebuildMode.USER_DEFINED)
{
- if(indexes.size() != 1)
+ if (indexes.size() != 1)
{
Message msg = ERR_TASK_INDEXREBUILD_ALL_ERROR.get();
throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, msg);
@@ -143,8 +140,8 @@
}
attrList = taskEntry.getAttribute(clearDegradedState);
- isClearDegradedState = Boolean.parseBoolean(
- TaskUtils.getSingleValueString(attrList));
+ isClearDegradedState =
+ Boolean.parseBoolean(TaskUtils.getSingleValueString(attrList));
attrList = taskEntry.getAttribute(typeTmpDirectory);
tmpDirectory = TaskUtils.getSingleValueString(attrList);
@@ -179,7 +176,7 @@
{
rebuildConfig.setBaseDN(DN.decode(baseDN));
}
- catch(DirectoryException de)
+ catch (DirectoryException de)
{
Message message =
ERR_CANNOT_DECODE_BASE_DN.get(baseDN, de.getMessageObject());
@@ -187,7 +184,7 @@
return TaskState.STOPPED_BY_ERROR;
}
- for(String index : indexes)
+ for (String index : indexes)
{
rebuildConfig.addRebuildIndex(index);
}
@@ -199,7 +196,7 @@
Backend backend =
DirectoryServer.getBackendWithBaseDN(rebuildConfig.getBaseDN());
- if(backend == null)
+ if (backend == null)
{
Message message = ERR_NO_BACKENDS_FOR_BASE.get(baseDN);
logError(message);
@@ -215,7 +212,7 @@
// Acquire a shared lock for the backend if we are rebuilding attribute
// indexes only. If we are rebuilding one or more system indexes, we have
- // to aquire exclusive lock.
+ // to acquire exclusive lock.
String lockFile = LockFileManager.getBackendLockFileName(backend);
StringBuilder failureReason = new StringBuilder();
@@ -237,23 +234,25 @@
try
{
- if(! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
+ if (!LockFileManager.acquireExclusiveLock(lockFile, failureReason))
{
- Message message = ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
+ Message message =
+ ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(backend
+ .getBackendID(), String.valueOf(failureReason));
logError(message);
return TaskState.STOPPED_BY_ERROR;
}
}
catch (Exception e)
{
- Message message = ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(e));
+ Message message =
+ ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(backend
+ .getBackendID(), getExceptionMessage(e));
logError(message);
return TaskState.STOPPED_BY_ERROR;
}
- if(tmpDirectory == null)
+ if (tmpDirectory == null)
{
tmpDirectory = "import-tmp";
}
@@ -261,10 +260,11 @@
rebuildConfig.setRebuildMode(rebuildMode);
TaskState returnCode = TaskState.COMPLETED_SUCCESSFULLY;
+
// Launch the rebuild process.
try
{
- BackendImpl jebBackend = (BackendImpl)backend;
+ BackendImpl jebBackend = (BackendImpl) backend;
jebBackend.rebuildBackend(rebuildConfig);
}
catch (Exception e)
@@ -279,6 +279,7 @@
logError(message);
returnCode = TaskState.STOPPED_BY_ERROR;
}
+
// Release the lock on the backend.
finally
{
@@ -286,24 +287,26 @@
{
lockFile = LockFileManager.getBackendLockFileName(backend);
failureReason = new StringBuilder();
- if (! LockFileManager.releaseLock(lockFile, failureReason))
+ if (!LockFileManager.releaseLock(lockFile, failureReason))
{
- Message message = WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), String.valueOf(failureReason));
+ Message message =
+ WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend
+ .getBackendID(), String.valueOf(failureReason));
logError(message);
returnCode = TaskState.COMPLETED_WITH_ERRORS;
}
}
catch (Throwable t)
{
- Message message = WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(
- backend.getBackendID(), getExceptionMessage(t));
+ Message message =
+ WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
+ getExceptionMessage(t));
logError(message);
returnCode = TaskState.COMPLETED_WITH_ERRORS;
}
}
- if(returnCode == TaskState.COMPLETED_SUCCESSFULLY)
+ if (returnCode == TaskState.COMPLETED_SUCCESSFULLY)
{
// Enable the backend.
try
--
Gitblit v1.10.0