From a06fd90c9b6bfb5f9130146373ba18e5769593b6 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Wed, 29 Jan 2014 11:30:37 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 :    Migrate I18n and logging support to i18n framework and SLF4J

---
 opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java |   44 +++++++++++++-------------------------------
 1 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java b/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java
index 78a7f35..e99344f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java
@@ -173,9 +173,7 @@
     }
     catch (DirectoryException de)
     {
-      LocalizableMessage message =
-          ERR_CANNOT_DECODE_BASE_DN.get(baseDN, de.getMessageObject());
-      logError(message);
+      logger.error(ERR_CANNOT_DECODE_BASE_DN, baseDN, de.getMessageObject());
       return TaskState.STOPPED_BY_ERROR;
     }
 
@@ -201,15 +199,13 @@
 
     if (backend == null)
     {
-      LocalizableMessage message = ERR_NO_BACKENDS_FOR_BASE.get(baseDN);
-      logError(message);
+      logger.error(ERR_NO_BACKENDS_FOR_BASE, baseDN);
       return TaskState.STOPPED_BY_ERROR;
     }
 
     if (!(backend instanceof BackendImpl))
     {
-      LocalizableMessage message = ERR_REBUILDINDEX_WRONG_BACKEND_TYPE.get();
-      logError(message);
+      logger.error(ERR_REBUILDINDEX_WRONG_BACKEND_TYPE);
       return TaskState.STOPPED_BY_ERROR;
     }
 
@@ -230,7 +226,7 @@
       {
         logger.traceException(e);
 
-        logError(e.getMessageObject());
+        logger.error(e.getMessageObject());
         return TaskState.STOPPED_BY_ERROR;
       }
 
@@ -238,19 +234,15 @@
       {
         if (!LockFileManager.acquireExclusiveLock(lockFile, failureReason))
         {
-          LocalizableMessage message =
-              ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(backend
+          logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend
                   .getBackendID(), String.valueOf(failureReason));
-          logError(message);
           return TaskState.STOPPED_BY_ERROR;
         }
       }
       catch (Exception e)
       {
-        LocalizableMessage message =
-            ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND.get(backend
+        logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend
                 .getBackendID(), getExceptionMessage(e));
-        logError(message);
         return TaskState.STOPPED_BY_ERROR;
       }
     }
@@ -261,19 +253,15 @@
       {
         if (!LockFileManager.acquireSharedLock(lockFile, failureReason))
         {
-          LocalizableMessage message =
-              ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND.get(backend
+          logger.error(ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND, backend
                   .getBackendID(), String.valueOf(failureReason));
-          logError(message);
           return TaskState.STOPPED_BY_ERROR;
         }
       }
       catch (Exception e)
       {
-        LocalizableMessage message =
-            ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND.get(backend
+        logger.error(ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND, backend
                 .getBackendID(), getExceptionMessage(e));
-        logError(message);
         return TaskState.STOPPED_BY_ERROR;
       }
     }
@@ -293,7 +281,7 @@
       LocalizableMessage message =
           ERR_REBUILDINDEX_ERROR_DURING_REBUILD.get(e.getMessage());
       logger.traceException(e);
-      logError(message);
+      logger.error(message);
       isBackendNeedToBeEnabled = true;
       returnCode = TaskState.STOPPED_BY_ERROR;
     }
@@ -301,9 +289,7 @@
     {
       logger.traceException(e);
 
-      LocalizableMessage message =
-          ERR_REBUILDINDEX_ERROR_DURING_REBUILD.get(e.getMessage());
-      logError(message);
+      logger.error(ERR_REBUILDINDEX_ERROR_DURING_REBUILD, e.getMessage());
       returnCode = TaskState.STOPPED_BY_ERROR;
     }
     finally
@@ -315,19 +301,15 @@
         failureReason = new StringBuilder();
         if (!LockFileManager.releaseLock(lockFile, failureReason))
         {
-          LocalizableMessage message =
-              WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend
+          logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND, backend
                   .getBackendID(), String.valueOf(failureReason));
-          logError(message);
           returnCode = TaskState.COMPLETED_WITH_ERRORS;
         }
       }
       catch (Throwable t)
       {
-        LocalizableMessage message =
-            WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
+        logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(),
                 getExceptionMessage(t));
-        logError(message);
         returnCode = TaskState.COMPLETED_WITH_ERRORS;
       }
     }
@@ -346,7 +328,7 @@
       {
         logger.traceException(e);
 
-        logError(e.getMessageObject());
+        logger.error(e.getMessageObject());
         returnCode = TaskState.STOPPED_BY_ERROR;
       }
     }

--
Gitblit v1.10.0