Removed now useless calls to String.valueOf() on arguments of Logger.*(...).

Jean-Noel Rouvignac

03.32.2014 f621f2931b8a47a666e180093fbc11416078f191

Removed now useless calls to String.valueOf() on arguments of Logger.*(...).

 opendj3-server-dev/replace.rb

@@ -222,7 +222,30 @@
      ]
  }

  LOG_ISTRACEENABLED_TRACEEXCEPTION = {
  LOGGER_TOSTRING = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
        # Need to fix removing the last parentheses
        /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*String\s*\.\s*valueOf\s*\(/m,
        /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\.toString\(\)/m,
        '\1',
      ]
  }

  LOGGER_STRING_VALUEOF = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
        # Need to fix removing the last parentheses
        /(logger\.\s*(trace|debug|warn|info|error)\s*\([^;]*)\s*String\s*\.\s*valueOf\s*\(/m,
        '\1',
      ]
  }

  LOGGER_ISTRACEENABLED_TRACEEXCEPTION = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
@@ -235,7 +258,7 @@
  }

  # List of replacements to run
  REPLACEMENTS = [ MSG_ARGN_STRING_VALUEOF ]
  REPLACEMENTS = [ LOGGER_STRING_VALUEOF ]
  #REPLACEMENTS = [ MESSAGES, TYPES, DN_TYPES, EXCEPTIONS, LOGGERS, I18N_LOGGERS ]



 opendj3-server-dev/src/server/org/opends/server/admin/AggregationPropertyDefinition.java

@@ -26,9 +26,8 @@
 */
package org.opends.server.admin;



import static org.opends.messages.AdminMessages.*;
import static org.opends.server.util.StaticUtils.*;
import static org.forgerock.util.Reject.*;

import java.util.Collection;
@@ -63,9 +62,6 @@
import org.opends.server.types.ConfigChangeResult;
import org.opends.server.types.DN;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;



/**
 * Aggregation property definition.
@@ -309,10 +305,8 @@
      } catch (ConfigException e) {
        // The condition could not be evaluated.
        logger.traceException(e);

        logger.error(ERR_REFINT_UNABLE_TO_EVALUATE_TARGET_CONDITION, mo
            .getManagedObjectDefinition().getUserFriendlyName(), String
            .valueOf(mo.getDN()), StaticUtils.getExceptionMessage(e));
        logger.error(ERR_REFINT_UNABLE_TO_EVALUATE_TARGET_CONDITION,
            mo.getManagedObjectDefinition().getUserFriendlyName(), mo.getDN(), getExceptionMessage(e));
        unacceptableReasons.add(message);
        return false;
      }

 opendj3-server-dev/src/server/org/opends/server/admin/ClassLoaderProvider.java

@@ -556,7 +556,7 @@
      if (!extensionsPath.exists()) {
        // The extensions directory does not exist. This is not a
        // critical problem.
        logger.error(ERR_ADMIN_NO_EXTENSIONS_DIR, String.valueOf(extensionsPath));
        logger.error(ERR_ADMIN_NO_EXTENSIONS_DIR, extensionsPath);
        return;
      }


 opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciHandler.java

@@ -819,8 +819,7 @@
          && !operation.getClientConnection().hasPrivilege(
              Privilege.MODIFY_ACL, operation))
      {
        logger.debug(INFO_ACI_MODIFY_FAILED_PRIVILEGE, String.valueOf(container
                .getResourceDN()), String.valueOf(container.getClientDN()));
        logger.debug(INFO_ACI_MODIFY_FAILED_PRIVILEGE, container.getResourceDN(), container.getClientDN());
        return false;
      }
      // This access check handles the case where all attributes of this
@@ -994,8 +993,7 @@
    final Lock entryLock = LockManager.lockRead(superiorDN);
    if (entryLock == null)
    {
      logger.warn(WARN_ACI_HANDLER_CANNOT_LOCK_NEW_SUPERIOR_USER, String
              .valueOf(superiorDN));
      logger.warn(WARN_ACI_HANDLER_CANNOT_LOCK_NEW_SUPERIOR_USER, superiorDN);
      return false;
    }

@@ -1210,8 +1208,7 @@
          {
            aciListenerMgr.logMsgsSetLockDownMode(failedACIMsgs);
          }
          logger.debug(INFO_ACI_ADD_LIST_ACIS, Integer.toString(validAcis),
                String.valueOf(baseDN));
          logger.debug(INFO_ACI_ADD_LIST_ACIS, validAcis, baseDN);
        }
      }
      catch (Exception e)
@@ -1448,7 +1445,7 @@
      if (!operation.getClientConnection().hasPrivilege(
          Privilege.MODIFY_ACL, operation))
      {
        logger.debug(INFO_ACI_ADD_FAILED_PRIVILEGE, String.valueOf(entry.getName()), String.valueOf(clientDN));
        logger.debug(INFO_ACI_ADD_FAILED_PRIVILEGE, entry.getName(), clientDN);
        return false;
      }
      List<Attribute> attributeList =

 opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciList.java

@@ -448,7 +448,7 @@
              //This should never happen since only a copy of the
              //ACI with a new DN is being made. Log a message if it does and
              //keep going.
              logger.warn(WARN_ACI_ADD_LIST_FAILED_DECODE, aci, String.valueOf(relocateDN), ex.getMessage());
              logger.warn(WARN_ACI_ADD_LIST_FAILED_DECODE, aci, relocateDN, ex.getMessage());
            }
          }
          tempAciList.put(relocateDN, acis);

 opendj3-server-dev/src/server/org/opends/server/authorization/dseecompat/AciListenerManager.java

@@ -471,13 +471,10 @@
      }
      if (!internalSearch.getSearchEntries().isEmpty())
      {
        int validAcis =
            aciList.addAci(internalSearch.getSearchEntries(),
                failedACIMsgs);
        int validAcis = aciList.addAci(internalSearch.getSearchEntries(), failedACIMsgs);
        if (!failedACIMsgs.isEmpty())
          logMsgsSetLockDownMode(failedACIMsgs);
        logger.debug(INFO_ACI_ADD_LIST_ACIS, Integer.toString(validAcis),
                String.valueOf(baseDN));
        logger.debug(INFO_ACI_ADD_LIST_ACIS, validAcis, baseDN);
      }
    }
  }

 opendj3-server-dev/src/server/org/opends/server/backends/RootDSEBackend.java

@@ -232,7 +232,7 @@
          Backend backend = DirectoryServer.getBackend(baseDN);
          if (backend == null)
          {
            logger.warn(WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE, String.valueOf(baseDN));
            logger.warn(WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE, baseDN);
          }
          else
          {
@@ -476,7 +476,7 @@

    // This method should never be used to get anything other than the root DSE.
    // If we got here, then that appears to be the case, so log a message.
    logger.warn(WARN_ROOTDSE_GET_ENTRY_NONROOT, String.valueOf(entryDN));
    logger.warn(WARN_ROOTDSE_GET_ENTRY_NONROOT, entryDN);


    // Go ahead and check the subordinate backends to see if we can find the

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/AttributeIndex.java

@@ -262,7 +262,7 @@
                                                    toLowerCase(ruleName));
        if(rule == null)
        {
          logger.error(ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE, String.valueOf(attrType),ruleName);
          logger.error(ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE, attrType, ruleName);
          continue;
        }
        Map<String,Index> indexMap = new HashMap<String,Index>();
@@ -2138,7 +2138,7 @@
                                            toLowerCase(ruleName));
           if(rule == null)
          {
            logger.error(ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE, String.valueOf(attrType),ruleName);
            logger.error(ERR_CONFIG_INDEX_TYPE_NEEDS_VALID_MATCHING_RULE, attrType, ruleName);
            continue;
          }
          validRules.add(rule);

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/BackupManager.java

@@ -488,7 +488,7 @@

          Arrays.sort(logFiles);

          logger.info(NOTE_JEB_BACKUP_CLEANER_ACTIVITY, String.valueOf(logFiles.length));
          logger.info(NOTE_JEB_BACKUP_CLEANER_ACTIVITY, logFiles.length);
        }
        else
        {

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/ConfigurableEnvironment.java

@@ -337,9 +337,8 @@
          int cpus = Runtime.getRuntime().availableProcessors();
          value = Integer.valueOf(Math.max(24, cpus * 2));

          logger.debug(INFO_ERGONOMIC_SIZING_OF_JE_CLEANER_THREADS, String
                  .valueOf(cfg.dn().rdn().getAttributeValue(0)),
                  (Number) value);
          logger.debug(INFO_ERGONOMIC_SIZING_OF_JE_CLEANER_THREADS,
              cfg.dn().rdn().getAttributeValue(0), (Number) value);
        }
        else if (attrName.equals(ATTR_NUM_LOCK_TABLES)
            && value == null)
@@ -353,9 +352,7 @@
          BigInteger tmp = BigInteger.valueOf((cleaners + workers) * 2);
          value = tmp.nextProbablePrime();

          logger.debug(INFO_ERGONOMIC_SIZING_OF_JE_LOCK_TABLES, String
                  .valueOf(cfg.dn().rdn().getAttributeValue(0)),
                  (Number) value);
          logger.debug(INFO_ERGONOMIC_SIZING_OF_JE_LOCK_TABLES, cfg.dn().rdn().getAttributeValue(0), (Number) value);
        }

        return String.valueOf(value);

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/VerifyJob.java

@@ -1560,9 +1560,7 @@

          logger.trace("Error normalizing values of attribute %s in " +
              "entry <%s>: %s.%n",
                     attrIndex.getAttributeType().toString(),
                     entry.getName().toString(),
                     String.valueOf(e.getMessageObject()));
                     attrIndex.getAttributeType(), entry.getName(), e.getMessageObject());
        }
      }
    }
@@ -1594,9 +1592,7 @@

          logger.trace("Error checking entry %s against filter or " +
              "base DN for VLV index %s: %s",
                     entry.getName().toString(),
                     vlvIndex.getName(),
                     String.valueOf(e.getMessageObject()));
                     entry.getName(), vlvIndex.getName(), e.getMessageObject());
        }
        errorCount++;
      }

 opendj3-server-dev/src/server/org/opends/server/backends/jeb/importLDIF/Importer.java

@@ -1270,8 +1270,7 @@
          DatabaseEntry data = new DatabaseEntry();
          LockMode lockMode = LockMode.DEFAULT;
          OperationStatus status;
          logger.info(NOTE_JEB_IMPORT_MIGRATION_START, "excluded", String
                  .valueOf(suffix.getBaseDN()));
          logger.info(NOTE_JEB_IMPORT_MIGRATION_START, "excluded", suffix.getBaseDN());
          Cursor cursor =
              entryContainer.getDN2ID().openCursor(null,
                  CursorConfig.READ_COMMITTED);
@@ -1360,8 +1359,7 @@
          DatabaseEntry data = new DatabaseEntry();
          LockMode lockMode = LockMode.DEFAULT;
          OperationStatus status;
          logger.info(NOTE_JEB_IMPORT_MIGRATION_START, "existing", String
                  .valueOf(suffix.getBaseDN()));
          logger.info(NOTE_JEB_IMPORT_MIGRATION_START, "existing", suffix.getBaseDN());
          Cursor cursor = entryContainer.getDN2ID().openCursor(null, null);
          try
          {

 opendj3-server-dev/src/server/org/opends/server/backends/task/Task.java

@@ -1172,7 +1172,7 @@

      taskState = TaskState.STOPPED_BY_ERROR;

      logger.error(ERR_TASK_EXECUTE_FAILED, String.valueOf(taskEntry.getName()), stackTraceToSingleLineString(e));
      logger.error(ERR_TASK_EXECUTE_FAILED, taskEntry.getName(), stackTraceToSingleLineString(e));
    }

    return taskState;

 opendj3-server-dev/src/server/org/opends/server/backends/task/TaskScheduler.java

@@ -1100,8 +1100,7 @@
          DN parentDN = entryDN.getParentDNInSuffix();
          if (parentDN == null)
          {
            logger.error(ERR_TASKSCHED_ENTRY_HAS_NO_PARENT, String.valueOf(entryDN),
                    String.valueOf(taskBackend.getTaskRootDN()));
            logger.error(ERR_TASKSCHED_ENTRY_HAS_NO_PARENT, entryDN, taskBackend.getTaskRootDN());
          }
          else if (parentDN.equals(taskBackend.getScheduledTasksParentDN()))
          {
@@ -1113,7 +1112,7 @@
                String id = task.getTaskID();
                if (tasks.containsKey(id))
                {
                  logger.warn(WARN_TASKSCHED_DUPLICATE_TASK_ID, String.valueOf(id));
                  logger.warn(WARN_TASKSCHED_DUPLICATE_TASK_ID, id);
                }
                else
                {
@@ -1129,9 +1128,7 @@
            catch (DirectoryException de)
            {
              logger.traceException(de);

              logger.error(ERR_TASKSCHED_CANNOT_SCHEDULE_TASK_FROM_ENTRY,
                  String.valueOf(entryDN), de.getMessageObject());
              logger.error(ERR_TASKSCHED_CANNOT_SCHEDULE_TASK_FROM_ENTRY, entryDN, de.getMessageObject());
            }
          }
          else if (parentDN.equals(taskBackend.getRecurringTasksParentDN()))
@@ -1144,15 +1141,12 @@
            catch (DirectoryException de)
            {
              logger.traceException(de);

              logger.error(
                  ERR_TASKSCHED_CANNOT_SCHEDULE_RECURRING_TASK_FROM_ENTRY,
                  String.valueOf(entryDN), de.getMessageObject());
              logger.error(ERR_TASKSCHED_CANNOT_SCHEDULE_RECURRING_TASK_FROM_ENTRY, entryDN, de.getMessageObject());
            }
          }
          else
          {
            logger.error(ERR_TASKSCHED_INVALID_TASK_ENTRY_DN, String.valueOf(entryDN), backingFilePath);
            logger.error(ERR_TASKSCHED_INVALID_TASK_ENTRY_DN, entryDN, backingFilePath);
          }
        }
      }

 opendj3-server-dev/src/server/org/opends/server/backends/task/TaskThread.java

@@ -197,9 +197,7 @@
        logger.traceException(e);

        Task task = getAssociatedTask();

        logger.error(ERR_TASK_EXECUTE_FAILED, String.valueOf(task.getTaskEntry().getName()),
                stackTraceToSingleLineString(e));
        logger.error(ERR_TASK_EXECUTE_FAILED, task.getTaskEntry().getName(), stackTraceToSingleLineString(e));
        task.setTaskState(TaskState.STOPPED_BY_ERROR);
      }


 opendj3-server-dev/src/server/org/opends/server/config/JMXMBean.java

@@ -158,8 +158,7 @@
      } catch (Exception e)
      {
        logger.traceException(e);

          logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN, String.valueOf(e));
        logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN, e);
      }
      return nameStr ;
  }
@@ -206,7 +205,7 @@
            catch (Exception e)
            {
              logger.traceException(e);
              logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN, String.valueOf(e));
              logger.error(ERR_CONFIG_JMX_CANNOT_REGISTER_MBEAN, configEntryDN, e);
            }
        }
    }

 opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java

@@ -141,8 +141,7 @@
          }
          catch (DirectoryException de)
          {
            logger.warn(WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX, String
                .valueOf(syntaxConfiguration.dn()), de.getMessageObject());
            logger.warn(WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX, syntaxConfiguration.dn(), de.getMessageObject());
            continue;
          }
        }

 opendj3-server-dev/src/server/org/opends/server/core/BackendConfigManager.java

@@ -166,7 +166,7 @@
        // then log an error and skip it.
        if (DirectoryServer.hasBackend(backendCfg.getBackendId()))
        {
          logger.warn(WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID, backendID, String.valueOf(backendDN));
          logger.warn(WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID, backendID, backendDN);
          continue;
        }

@@ -188,9 +188,7 @@
        catch (Exception e)
        {
          logger.traceException(e);

          logger.error(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE, String.valueOf(className), String.valueOf(backendDN),
                  stackTraceToSingleLineString(e));
          logger.error(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE, className, backendDN, stackTraceToSingleLineString(e));
          continue;
        }

@@ -236,7 +234,7 @@
          StringBuilder failureReason = new StringBuilder();
          if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
          {
            logger.error(ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK, backendID, String.valueOf(failureReason));
            logger.error(ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK, backendID, failureReason);
            // FIXME -- Do we need to send an admin alert?
            continue;
          }
@@ -244,7 +242,6 @@
        catch (Exception e)
        {
          logger.traceException(e);

          logger.error(ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK, backendID, stackTraceToSingleLineString(e));
          // FIXME -- Do we need to send an admin alert?
          continue;
@@ -259,9 +256,7 @@
        catch (Exception e)
        {
          logger.traceException(e);

          logger.error(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE, String.valueOf(className), String.valueOf(backendDN),
                  stackTraceToSingleLineString(e));
          logger.error(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE, className, backendDN, stackTraceToSingleLineString(e));

          try
          {
@@ -269,7 +264,7 @@
            StringBuilder failureReason = new StringBuilder();
            if (! LockFileManager.releaseLock(lockFile, failureReason))
            {
              logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, String.valueOf(failureReason));
              logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, failureReason);
              // FIXME -- Do we need to send an admin alert?
            }
          }
@@ -314,9 +309,8 @@
      }
      else
      {
        // The backend is explicitly disabled.  Log a mild warning and
        // continue.
        logger.debug(INFO_CONFIG_BACKEND_DISABLED, String.valueOf(backendDN));
        // The backend is explicitly disabled.  Log a mild warning and continue.
        logger.debug(INFO_CONFIG_BACKEND_DISABLED, backendDN);
      }
    }
  }
@@ -488,15 +482,13 @@
            StringBuilder failureReason = new StringBuilder();
            if (! LockFileManager.releaseLock(lockFile, failureReason))
            {
              logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK,
                  backend.getBackendID(), String.valueOf(failureReason));
              logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backend.getBackendID(), failureReason);
              // FIXME -- Do we need to send an admin alert?
            }
          }
          catch (Exception e2)
          {
            logger.traceException(e2);

            logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backend
                .getBackendID(), stackTraceToSingleLineString(e2));
            // FIXME -- Do we need to send an admin alert?
@@ -981,14 +973,13 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.releaseLock(lockFile, failureReason))
        {
          logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, String.valueOf(failureReason));
          logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, failureReason);
          // FIXME -- Do we need to send an admin alert?
        }
      }
      catch (Exception e2)
      {
        logger.traceException(e2);

        logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backendID, stackTraceToSingleLineString(e2));
        // FIXME -- Do we need to send an admin alert?
      }
@@ -1123,15 +1114,13 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.releaseLock(lockFile, failureReason))
        {
          logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backend
              .getBackendID(), String.valueOf(failureReason));
          logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backend.getBackendID(), failureReason);
          // FIXME -- Do we need to send an admin alert?
        }
      }
      catch (Exception e2)
      {
        logger.traceException(e2);

        logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK, backend
            .getBackendID(), stackTraceToSingleLineString(e2));
        // FIXME -- Do we need to send an admin alert?

 opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java

@@ -8044,8 +8044,7 @@
          StringBuilder failureReason = new StringBuilder();
          if (! LockFileManager.releaseLock(lockFile, failureReason))
          {
            logger.warn(WARN_SHUTDOWN_CANNOT_RELEASE_SHARED_BACKEND_LOCK,
                backend.getBackendID(), String.valueOf(failureReason));
            logger.warn(WARN_SHUTDOWN_CANNOT_RELEASE_SHARED_BACKEND_LOCK, backend.getBackendID(), failureReason);
            // FIXME -- Do we need to send an admin alert?
          }
        }

 opendj3-server-dev/src/server/org/opends/server/core/MatchingRuleConfigManager.java

@@ -149,8 +149,7 @@
          }
          catch (DirectoryException de)
          {
            logger.warn(WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR, String
                .valueOf(mrConfiguration.dn()), de.getMessageObject());
            logger.warn(WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR, mrConfiguration.dn(), de.getMessageObject());
            continue;
          }
        }

 opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyConfigManager.java

@@ -156,8 +156,7 @@
          {
            // Just log a message instead of failing the server initialization.
            // This will allow the administrator to fix any problems.
            logger.error(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG, String.valueOf(subentry.getDN()),
                stackTraceToSingleLineString(e));
            logger.error(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG, subentry.getDN(), stackTraceToSingleLineString(e));
          }
        }
      }

 opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerSync.java

@@ -211,8 +211,8 @@
    ResultCode resultCode = searchOperation.getResultCode();
    if (resultCode != ResultCode.SUCCESS)
    {
      logger.debug(INFO_TRUSTSTORESYNC_ADMIN_SUFFIX_SEARCH_FAILED, String.valueOf(adminSuffixDN),
                searchOperation.getErrorMessage().toString());
      logger.debug(INFO_TRUSTSTORESYNC_ADMIN_SUFFIX_SEARCH_FAILED, adminSuffixDN,
                searchOperation.getErrorMessage());
    }

    for (SearchResultEntry searchEntry : searchOperation.getSearchEntries())
@@ -425,8 +425,7 @@

    if (delOperation.getResultCode() != ResultCode.SUCCESS)
    {
      logger.debug(INFO_TRUSTSTORESYNC_DELETE_FAILED, String.valueOf(dstDN),
           String.valueOf(delOperation.getErrorMessage()));
      logger.debug(INFO_TRUSTSTORESYNC_DELETE_FAILED, dstDN, delOperation.getErrorMessage());
    }
  }

@@ -466,8 +465,7 @@
    AddOperation addOperation = conn.processAdd(addEntry);
    if (addOperation.getResultCode() != ResultCode.SUCCESS)
    {
      logger.debug(INFO_TRUSTSTORESYNC_ADD_FAILED, String.valueOf(dstDN),
           String.valueOf(addOperation.getErrorMessage()));
      logger.debug(INFO_TRUSTSTORESYNC_ADD_FAILED, dstDN, addOperation.getErrorMessage());
    }
  }


 opendj3-server-dev/src/server/org/opends/server/extensions/ConfigFileHandler.java

@@ -3261,19 +3261,16 @@

    if (resultCode != ResultCode.SUCCESS)
    {
      logger.error(ERR_CONFIG_CHANGE_RESULT_ERROR, String.valueOf(className), String.valueOf(methodName),
              String.valueOf(entryDN), String.valueOf(resultCode),
              adminActionRequired, messageBuffer.toString());
      logger.error(ERR_CONFIG_CHANGE_RESULT_ERROR, className, methodName,
              entryDN, resultCode, adminActionRequired, messageBuffer);
    }
    else if (adminActionRequired)
    {
      logger.warn(WARN_CONFIG_CHANGE_RESULT_ACTION_REQUIRED, String.valueOf(className), String.valueOf(methodName),
              String.valueOf(entryDN), messageBuffer.toString());
      logger.warn(WARN_CONFIG_CHANGE_RESULT_ACTION_REQUIRED, className, methodName, entryDN, messageBuffer);
    }
    else if (messageBuffer.length() > 0)
    {
      logger.debug(INFO_CONFIG_CHANGE_RESULT_MESSAGES, String.valueOf(className), String.valueOf(methodName),
              String.valueOf(entryDN), messageBuffer.toString());
      logger.debug(INFO_CONFIG_CHANGE_RESULT_MESSAGES, className, methodName, entryDN, messageBuffer);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroup.java

@@ -158,7 +158,7 @@
          {
            logger.traceException(de);
            logger.error(ERR_DYNAMICGROUP_CANNOT_DECODE_MEMBERURL, v.getValue(),
                    String.valueOf(groupEntry.getName()), de.getMessageObject());
                    groupEntry.getName(), de.getMessageObject());
          }
        }
      }

 opendj3-server-dev/src/server/org/opends/server/extensions/DynamicGroupSearchThread.java

@@ -135,8 +135,8 @@
      {
        if (resultCode == ResultCode.NO_SUCH_OBJECT)
        {
          logger.warn(WARN_DYNAMICGROUP_NONEXISTENT_BASE_DN, String.valueOf(baseDNs[searchCounter]),
                  String.valueOf(memberList.getDynamicGroupDN()));
          logger.warn(WARN_DYNAMICGROUP_NONEXISTENT_BASE_DN, baseDNs[searchCounter],
                  memberList.getDynamicGroupDN());
          continue;
        }
        else

 opendj3-server-dev/src/server/org/opends/server/extensions/LDAPPassThroughAuthenticationPolicyFactory.java

@@ -1625,9 +1625,8 @@
              {
                logger.trace(
                    "An error occurred while trying to update the LDAP PTA "
                        + "cached password for user %s: %s", userEntry.getName()
                        .toString(), String.valueOf(internalModify
                        .getErrorMessage()));
                        + "cached password for user %s: %s",
                        userEntry.getName(), internalModify.getErrorMessage());
              }
            }


 opendj3-server-dev/src/server/org/opends/server/extensions/PBKDF2PasswordStorageScheme.java

@@ -282,7 +282,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, e);
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkQueue.java

@@ -168,9 +168,7 @@
    catch (Exception e)
    {
      logger.traceException(e);

      logger.error(ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR, String
          .valueOf(ParallelWorkQueueMonitor.class), String.valueOf(e));
      logger.error(ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR, ParallelWorkQueueMonitor.class, e);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/extensions/ParallelWorkerThread.java

@@ -167,7 +167,7 @@
        {
          logger.trace(
            "Uncaught exception in worker thread while processing " +
                "operation %s: %s", String.valueOf(operation), t);
                "operation %s: %s", operation, t);

          logger.traceException(t);
        }

 opendj3-server-dev/src/server/org/opends/server/extensions/SaltedMD5PasswordStorageScheme.java

@@ -279,7 +279,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, e);
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA1PasswordStorageScheme.java

@@ -286,7 +286,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, e);
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA256PasswordStorageScheme.java

@@ -291,7 +291,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, e);
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA384PasswordStorageScheme.java

@@ -292,7 +292,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, e);
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/SaltedSHA512PasswordStorageScheme.java

@@ -291,7 +291,7 @@
    catch (Exception e)
    {
      logger.traceException(e);
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, String.valueOf(e));
      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD, storedPassword, e);
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/extensions/StaticGroup.java

@@ -244,11 +244,8 @@
          catch (DirectoryException de)
          {
            logger.traceException(de);

            logger.error(ERR_STATICGROUP_CANNOT_DECODE_MEMBER_VALUE_AS_DN, v.getValue(),
                    someMemberAttributeType.getNameOrOID(),
                    String.valueOf(groupEntry.getName()),
                    de.getMessageObject());
                someMemberAttributeType.getNameOrOID(), groupEntry.getName(), de.getMessageObject());
          }
        }
      }

 opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkQueue.java

@@ -212,9 +212,7 @@
      catch (Exception e)
      {
        logger.traceException(e);

        logger.error(ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR, String.valueOf(TraditionalWorkQueueMonitor.class),
            String.valueOf(e));
        logger.error(ERR_CONFIG_WORK_QUEUE_CANNOT_CREATE_MONITOR, TraditionalWorkQueueMonitor.class, e);
      }
    }
    finally

 opendj3-server-dev/src/server/org/opends/server/extensions/TraditionalWorkerThread.java

@@ -167,8 +167,7 @@
        {
          logger.trace(
            "Uncaught exception in worker thread while processing " +
                "operation %s: %s", String.valueOf(operation), t);

                "operation %s: %s", operation, t);
          logger.traceException(t);
        }


 opendj3-server-dev/src/server/org/opends/server/plugins/PasswordPolicyImportPlugin.java

@@ -352,8 +352,7 @@
                .getAuthenticationPolicy(policyDN);
            if (authPolicy == null)
            {
              logger.warn(WARN_PLUGIN_PWIMPORT_NO_SUCH_POLICY, String
                  .valueOf(entry.getName()), String.valueOf(policyDN));
              logger.warn(WARN_PLUGIN_PWIMPORT_NO_SUCH_POLICY, entry.getName(), policyDN);
            }
            else if (authPolicy.isPasswordPolicy())
            {
@@ -364,8 +363,7 @@
          }
          catch (DirectoryException de)
          {
            logger.warn(WARN_PLUGIN_PWIMPORT_CANNOT_DECODE_POLICY_DN, String
                .valueOf(entry.getName()), de.getMessageObject());
            logger.warn(WARN_PLUGIN_PWIMPORT_CANNOT_DECODE_POLICY_DN, entry.getName(), de.getMessageObject());
            break policyLoop;
          }
        }
@@ -409,8 +407,7 @@
                    logger.traceException(e);

                    logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
                        policy.getPasswordAttribute().getNameOrOID(), String
                            .valueOf(entry.getName()),
                        policy.getPasswordAttribute().getNameOrOID(), entry.getName(),
                        stackTraceToSingleLineString(e));
                    gotError = true;
                    break;
@@ -439,8 +436,7 @@
                    logger.traceException(e);

                    logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
                        policy.getPasswordAttribute().getNameOrOID(), String
                            .valueOf(entry.getName()),
                        policy.getPasswordAttribute().getNameOrOID(), entry.getName(),
                        stackTraceToSingleLineString(e));
                    gotError = true;
                    break;
@@ -497,10 +493,8 @@
            catch (Exception e)
            {
              logger.traceException(e);

              logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD, t
                  .getNameOrOID(), String.valueOf(entry.getName()),
                  stackTraceToSingleLineString(e));
              logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
                  t.getNameOrOID(), entry.getName(), stackTraceToSingleLineString(e));
              gotError = true;
              break;
            }
@@ -551,10 +545,8 @@
            catch (Exception e)
            {
              logger.traceException(e);

              logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD, t
                  .getNameOrOID(), String.valueOf(entry.getName()),
                  stackTraceToSingleLineString(e));
              logger.error(ERR_PLUGIN_PWPIMPORT_ERROR_ENCODING_PASSWORD,
                  t.getNameOrOID(), entry.getName(), stackTraceToSingleLineString(e));
              gotError = true;
              break;
            }

 opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfilerPlugin.java

@@ -195,7 +195,7 @@
        {
          logger.traceException(e);

          logger.error(ERR_PLUGIN_PROFILER_CANNOT_WRITE_PROFILE_DATA, String.valueOf(configEntryDN), filename,
          logger.error(ERR_PLUGIN_PROFILER_CANNOT_WRITE_PROFILE_DATA, configEntryDN, filename,
                  stackTraceToSingleLineString(e));
        }
      }

 opendj3-server-dev/src/server/org/opends/server/protocols/LDIFConnectionHandler.java

@@ -390,8 +390,7 @@
          changeRecord = reader.readChangeRecord(false);
          if (logger.isTraceEnabled())
          {
            logger.trace("Read change record entry " +
                             String.valueOf(changeRecord));
            logger.trace("Read change record entry %s", changeRecord);
          }
        }
        catch (LDIFException le)

 opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1InputStreamReader.java

@@ -393,9 +393,8 @@

      if(logger.isTraceEnabled())
      {
        logger.trace(
            String.format("READ ASN.1 BOOLEAN(type=0x%x, length=%d, value=%s)",
                peekType, peekLength, String.valueOf(readByte != 0x00)));
        logger.trace("READ ASN.1 BOOLEAN(type=0x%x, length=%d, value=%s)",
            peekType, peekLength, readByte != 0x00);
      }

      state = ELEMENT_READ_STATE_NEED_TYPE;

 opendj3-server-dev/src/server/org/opends/server/protocols/asn1/ASN1OutputStreamWriter.java

@@ -316,9 +316,8 @@

    if(logger.isTraceEnabled())
    {
      logger.trace(
          String.format("WRITE ASN.1 BOOLEAN(type=0x%x, length=%d, value=%s)",
              type, 1, String.valueOf(booleanValue)));
      logger.trace("WRITE ASN.1 BOOLEAN(type=0x%x, length=%d, value=%s)",
          type, 1, booleanValue);
    }
    return this;
  }

 opendj3-server-dev/src/server/org/opends/server/protocols/ldap/LDAPClientConnection.java

@@ -922,8 +922,7 @@
    if (ldapVersion == 2)
    {
      logger.error(ERR_LDAPV2_SKIPPING_SEARCH_REFERENCE, getConnectionID(),
              searchOperation.getOperationID(), String
                  .valueOf(searchReference));
              searchOperation.getOperationID(), searchReference);
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/tasks/AddSchemaFileTask.java

@@ -187,7 +187,7 @@
    final Lock schemaLock = LockManager.lockWrite(schemaDN);
    if (schemaLock == null)
    {
      logger.error(ERR_TASK_ADDSCHEMAFILE_CANNOT_LOCK_SCHEMA, String.valueOf(schemaDN));
      logger.error(ERR_TASK_ADDSCHEMAFILE_CANNOT_LOCK_SCHEMA, schemaDN);
      return TaskState.STOPPED_BY_ERROR;
    }

@@ -233,17 +233,13 @@
        catch (ConfigException ce)
        {
          logger.traceException(ce);

          logger.error(ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE, String
              .valueOf(schemaFile), ce.getMessage());
          logger.error(ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE, schemaFile, ce.getMessage());
          return TaskState.STOPPED_BY_ERROR;
        }
        catch (InitializationException ie)
        {
          logger.traceException(ie);

          logger.error(ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE, String
              .valueOf(schemaFile), ie.getMessage());
          logger.error(ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE, schemaFile, ie.getMessage());
          return TaskState.STOPPED_BY_ERROR;
        }
      }

 opendj3-server-dev/src/server/org/opends/server/tasks/BackupTask.java

@@ -514,7 +514,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
      {
        logger.error(ERR_BACKUPDB_CANNOT_LOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
        logger.error(ERR_BACKUPDB_CANNOT_LOCK_BACKEND, b.getBackendID(), failureReason);
        return false;
      }
    }
@@ -540,7 +540,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.releaseLock(lockFile, failureReason))
      {
        logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
        logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), failureReason);
        return false;
      }
    }

 opendj3-server-dev/src/server/org/opends/server/tasks/DisconnectClientTask.java

@@ -221,7 +221,7 @@
    // terminate it.
    if (clientConnection == null)
    {
      logger.error(ERR_TASK_DISCONNECT_NO_SUCH_CONNECTION, String.valueOf(connectionID));
      logger.error(ERR_TASK_DISCONNECT_NO_SUCH_CONNECTION, connectionID);

      return TaskState.COMPLETED_WITH_ERRORS;
    }

 opendj3-server-dev/src/server/org/opends/server/tasks/ExportTask.java

@@ -547,7 +547,7 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
        {
          logger.error(ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
          logger.error(ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), failureReason);
          return TaskState.STOPPED_BY_ERROR;
        }
      }
@@ -591,7 +591,7 @@
          StringBuilder failureReason = new StringBuilder();
          if (! LockFileManager.releaseLock(lockFile, failureReason))
          {
            logger.warn(WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
            logger.warn(WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
            return TaskState.COMPLETED_WITH_ERRORS;
          }
        }

 opendj3-server-dev/src/server/org/opends/server/tasks/ImportTask.java

@@ -957,7 +957,7 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
        {
          logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
          logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), failureReason);
          return TaskState.STOPPED_BY_ERROR;
        }
      }
@@ -1012,7 +1012,7 @@
          StringBuilder failureReason = new StringBuilder();
          if (! LockFileManager.releaseLock(lockFile, failureReason))
          {
            logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
            logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
            return TaskState.COMPLETED_WITH_ERRORS;
          }
        }

 opendj3-server-dev/src/server/org/opends/server/tasks/InitializeTargetTask.java

@@ -126,7 +126,7 @@
      logger.traceException(e);

      // This log will go to the task log message
      logger.error(ERR_TASK_EXECUTE_FAILED, String.valueOf(getTaskEntryDN()), stackTraceToSingleLineString(e));
      logger.error(ERR_TASK_EXECUTE_FAILED, getTaskEntryDN(), stackTraceToSingleLineString(e));

      return TaskState.STOPPED_BY_ERROR;
    }

 opendj3-server-dev/src/server/org/opends/server/tasks/RebuildTask.java

@@ -234,8 +234,7 @@
      {
        if (!LockFileManager.acquireExclusiveLock(lockFile, failureReason))
        {
          logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend
                  .getBackendID(), String.valueOf(failureReason));
          logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend.getBackendID(), failureReason);
          return TaskState.STOPPED_BY_ERROR;
        }
      }
@@ -253,8 +252,7 @@
      {
        if (!LockFileManager.acquireSharedLock(lockFile, failureReason))
        {
          logger.error(ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND, backend
                  .getBackendID(), String.valueOf(failureReason));
          logger.error(ERR_REBUILDINDEX_CANNOT_SHARED_LOCK_BACKEND, backend.getBackendID(), failureReason);
          return TaskState.STOPPED_BY_ERROR;
        }
      }
@@ -301,8 +299,7 @@
        failureReason = new StringBuilder();
        if (!LockFileManager.releaseLock(lockFile, failureReason))
        {
          logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND, backend
                  .getBackendID(), String.valueOf(failureReason));
          logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
          returnCode = TaskState.COMPLETED_WITH_ERRORS;
        }
      }

 opendj3-server-dev/src/server/org/opends/server/tasks/RestoreTask.java

@@ -175,7 +175,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
      {
        logger.error(ERR_RESTOREDB_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.error(ERR_RESTOREDB_CANNOT_LOCK_BACKEND, backend.getBackendID(), failureReason);
        return false;
      }
    }
@@ -200,7 +200,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.releaseLock(lockFile, failureReason))
      {
        logger.warn(WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.warn(WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
        return false;
      }
    }
@@ -251,7 +251,7 @@
    }
    catch (Exception e)
    {
      logger.error(ERR_RESTOREDB_CANNOT_READ_BACKUP_DIRECTORY, String.valueOf(backupDirectory), getExceptionMessage(e));
      logger.error(ERR_RESTOREDB_CANNOT_READ_BACKUP_DIRECTORY, backupDirectory, getExceptionMessage(e));
      return TaskState.STOPPED_BY_ERROR;
    }

@@ -263,7 +263,7 @@
      BackupInfo backupInfo = backupDir.getBackupInfo(backupID);
      if (backupInfo == null)
      {
        logger.error(ERR_RESTOREDB_INVALID_BACKUP_ID, backupID, String.valueOf(backupDirectory));
        logger.error(ERR_RESTOREDB_INVALID_BACKUP_ID, backupID, backupDirectory);
        return TaskState.STOPPED_BY_ERROR;
      }
    }
@@ -272,7 +272,7 @@
      BackupInfo latestBackup = backupDir.getLatestBackup();
      if (latestBackup == null)
      {
        logger.error(ERR_RESTOREDB_NO_BACKUPS_IN_DIRECTORY, String.valueOf(backupDirectory));
        logger.error(ERR_RESTOREDB_NO_BACKUPS_IN_DIRECTORY, backupDirectory);
        return TaskState.STOPPED_BY_ERROR;
      }
      else
@@ -293,7 +293,7 @@
    catch (ConfigException e)
    {
      logger.traceException(e);
      logger.error(ERR_RESTOREDB_NO_BACKENDS_FOR_DN, String.valueOf(backupDirectory), configEntryDN);
      logger.error(ERR_RESTOREDB_NO_BACKENDS_FOR_DN, backupDirectory, configEntryDN);
      return TaskState.STOPPED_BY_ERROR;
    }


 opendj3-server-dev/src/server/org/opends/server/tasks/TaskUtils.java

@@ -90,12 +90,12 @@
    }
    catch (ConfigException ce)
    {
      logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), ce.getMessage());
      logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), ce.getMessage());
      return null;
    }
    catch (Exception e)
    {
      logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), getExceptionMessage(e));
      logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), getExceptionMessage(e));
      return null;
    }
  }
@@ -173,12 +173,12 @@
      }
      catch (ConfigException ce)
      {
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), ce.getMessage());
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), ce.getMessage());
        continue;
      }
      catch (Exception e)
      {
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry.getDN()), getExceptionMessage(e));
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), getExceptionMessage(e));
        continue;
      }


 opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java

@@ -827,7 +827,7 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
        {
          logger.error(ERR_BACKUPDB_CANNOT_LOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
          logger.error(ERR_BACKUPDB_CANNOT_LOCK_BACKEND, b.getBackendID(), failureReason);
          errorsEncountered = true;
          continue;
        }
@@ -890,7 +890,7 @@
              StringBuilder failureReason = new StringBuilder();
              if (! LockFileManager.releaseLock(lockFile, failureReason))
              {
                logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
                logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), failureReason);
              }
            }
            catch (Exception e)
@@ -911,7 +911,7 @@
              StringBuilder failureReason = new StringBuilder();
              if (! LockFileManager.releaseLock(lockFile, failureReason))
              {
                logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
                logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), failureReason);
              }
            }
            catch (Exception e2)
@@ -944,7 +944,7 @@
            StringBuilder failureReason = new StringBuilder();
            if (! LockFileManager.releaseLock(lockFile, failureReason))
            {
              logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
              logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), failureReason);
            }
          }
          catch (Exception e2)
@@ -981,7 +981,7 @@
          StringBuilder failureReason = new StringBuilder();
          if (! LockFileManager.releaseLock(lockFile, failureReason))
          {
            logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
            logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), failureReason);
          }
        }
        catch (Exception e2)
@@ -1009,7 +1009,7 @@
          StringBuilder failureReason = new StringBuilder();
          if (! LockFileManager.releaseLock(lockFile, failureReason))
          {
            logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
            logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), failureReason);
          }
        }
        catch (Exception e)
@@ -1030,7 +1030,7 @@
          StringBuilder failureReason = new StringBuilder();
          if (! LockFileManager.releaseLock(lockFile, failureReason))
          {
            logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
            logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), failureReason);
          }
        }
        catch (Exception e2)
@@ -1049,7 +1049,7 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.releaseLock(lockFile, failureReason))
        {
          logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), String.valueOf(failureReason));
          logger.warn(WARN_BACKUPDB_CANNOT_UNLOCK_BACKEND, b.getBackendID(), failureReason);
          errorsEncountered = true;
        }
      }

 opendj3-server-dev/src/server/org/opends/server/tools/BackendToolUtils.java

@@ -140,14 +140,12 @@
      }
      catch (ConfigException ce)
      {
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry
                .getDN()), ce.getMessage());
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), ce.getMessage());
        return 1;
      }
      catch (Exception e)
      {
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, String.valueOf(configEntry
                .getDN()), getExceptionMessage(e));
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_ID, configEntry.getDN(), getExceptionMessage(e));
        return 1;
      }

@@ -174,14 +172,12 @@
      }
      catch (ConfigException ce)
      {
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, String.valueOf(configEntry
                .getDN()), ce.getMessage());
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, configEntry.getDN(), ce.getMessage());
        return 1;
      }
      catch (Exception e)
      {
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, String.valueOf(configEntry
                .getDN()), getExceptionMessage(e));
        logger.error(ERR_CANNOT_DETERMINE_BACKEND_CLASS, configEntry.getDN(), getExceptionMessage(e));
        return 1;
      }

@@ -192,8 +188,7 @@
      }
      catch (Exception e)
      {
        logger.error(ERR_CANNOT_LOAD_BACKEND_CLASS, backendClassName, String
                .valueOf(configEntry.getDN()), getExceptionMessage(e));
        logger.error(ERR_CANNOT_LOAD_BACKEND_CLASS, backendClassName, configEntry.getDN(), getExceptionMessage(e));
        return 1;
      }

@@ -208,8 +203,8 @@
      }
      catch (Exception e)
      {
        logger.error(ERR_CANNOT_INSTANTIATE_BACKEND_CLASS, backendClassName, String
                .valueOf(configEntry.getDN()), getExceptionMessage(e));
        logger.error(ERR_CANNOT_INSTANTIATE_BACKEND_CLASS,
            backendClassName, configEntry.getDN(), getExceptionMessage(e));
        return 1;
      }

@@ -227,7 +222,7 @@
            (DNConfigAttribute) configEntry.getConfigAttribute(baseDNStub);
        if (baseDNAttr == null)
        {
          logger.error(ERR_NO_BASES_FOR_BACKEND, String.valueOf(configEntry.getDN()));
          logger.error(ERR_NO_BASES_FOR_BACKEND, configEntry.getDN());
        }
        else
        {
@@ -236,8 +231,7 @@
      }
      catch (Exception e)
      {
        logger.error(ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND, String
                .valueOf(configEntry.getDN()), getExceptionMessage(e));
        logger.error(ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND, configEntry.getDN(), getExceptionMessage(e));
        return 1;
      }


 opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java

@@ -901,8 +901,7 @@
            backend = (Backend) backendClass.newInstance();
          } catch (Exception e) {
            logger.traceException(e);
            logger.error(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE, String.valueOf(className),
                  String.valueOf(backendCfg.dn()),
            logger.error(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE, className, backendCfg.dn(),
                  stackTraceToSingleLineString(e));
            continue;
          }
@@ -913,8 +912,7 @@
            backend.initializeBackend();
          } catch (Exception e) {
            logger.traceException(e);
            logger.error(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE, String.valueOf(className),
                  String.valueOf(backendCfg.dn()),
            logger.error(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE, className, backendCfg.dn(),
                  stackTraceToSingleLineString(e));
          }
          try {

 opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java

@@ -948,7 +948,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
      {
        logger.error(ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.error(ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), failureReason);
        return 1;
      }
    }
@@ -984,7 +984,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.releaseLock(lockFile, failureReason))
      {
        logger.warn(WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.warn(WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
      }
    }
    catch (Exception e)

 opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java

@@ -1463,7 +1463,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
      {
        logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.error(ERR_LDIFIMPORT_CANNOT_LOCK_BACKEND, backend.getBackendID(), failureReason);
        return 1;
      }
    }
@@ -1521,7 +1521,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.releaseLock(lockFile, failureReason))
      {
        logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.warn(WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
        retCode = 1;
      }
    }

 opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java

@@ -601,8 +601,7 @@
      final StringBuilder failureReason = new StringBuilder();
      if (!LockFileManager.acquireExclusiveLock(lockFile, failureReason))
      {
        logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend
                .getBackendID(), String.valueOf(failureReason));
        logger.error(ERR_REBUILDINDEX_CANNOT_EXCLUSIVE_LOCK_BACKEND, backend.getBackendID(), failureReason);
        return 1;
      }
    }

 opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java

@@ -637,7 +637,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
      {
        logger.error(ERR_RESTOREDB_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.error(ERR_RESTOREDB_CANNOT_LOCK_BACKEND, backend.getBackendID(), failureReason);
        return 1;
      }
    }
@@ -670,7 +670,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.releaseLock(lockFile, failureReason))
      {
        logger.warn(WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.warn(WARN_RESTOREDB_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
      }
    }
    catch (Exception e)

 opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java

@@ -480,7 +480,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
      {
        logger.error(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.error(ERR_VERIFYINDEX_CANNOT_LOCK_BACKEND, backend.getBackendID(), failureReason);
        return 1;
      }
    }
@@ -523,7 +523,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.releaseLock(lockFile, failureReason))
      {
        logger.warn(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), String.valueOf(failureReason));
        logger.warn(WARN_VERIFYINDEX_CANNOT_UNLOCK_BACKEND, backend.getBackendID(), failureReason);
      }
    }
    catch (Exception e)

 opendj3-server-dev/src/server/org/opends/server/types/Entry.java

@@ -4069,9 +4069,7 @@
      {
        if (logger.isTraceEnabled())
        {
          logger.trace(
              "Skipping entry %s because of the export " +
                  "configuration.", String.valueOf(dn));
          logger.trace("Skipping entry %s because of the export configuration.", dn);
        }
        return false;
      }
@@ -4132,9 +4130,7 @@
    {
      if (logger.isTraceEnabled())
      {
        logger.trace(
            "Skipping objectclasses for entry %s because of " +
            "the export configuration.", String.valueOf(dn));
        logger.trace("Skipping objectclasses for entry %s because of the export configuration.", dn);
      }
    }

@@ -4156,8 +4152,7 @@
      {
        logger.trace(
            "Skipping all operational attributes for entry %s " +
            "because of the export configuration.",
            String.valueOf(dn));
            "because of the export configuration.", dn);
      }
    }

@@ -4236,8 +4231,7 @@
        if (logger.isTraceEnabled())
        {
          logger.trace("Skipping %s attribute %s for entry %s "
              + "because of the export configuration.", attributeType, attrType
              .getNameOrOID(), String.valueOf(dn));
              + "because of the export configuration.", attributeType, attrType.getNameOrOID(), dn);
        }
      }
    }

 opendj3-server-dev/src/server/org/opends/server/util/ExpirationCheckTrustManager.java

@@ -100,16 +100,14 @@
      }
      catch (CertificateExpiredException cee)
      {
        logger.error(ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_EXPIRED, c
            .getSubjectDN().getName(), String.valueOf(c.getNotAfter()));

        logger.error(ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_EXPIRED,
            c.getSubjectDN().getName(), c.getNotAfter());
        throw cee;
      }
      catch (CertificateNotYetValidException cnyve)
      {
        logger.error(ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_NOT_YET_VALID, c
            .getSubjectDN().getName(), String.valueOf(c.getNotBefore()));

        logger.error(ERR_EXPCHECK_TRUSTMGR_CLIENT_CERT_NOT_YET_VALID,
            c.getSubjectDN().getName(), c.getNotBefore());
        throw cnyve;
      }
    }
@@ -143,16 +141,14 @@
      }
      catch (CertificateExpiredException cee)
      {
        logger.error(ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_EXPIRED, c
            .getSubjectDN().getName(), String.valueOf(c.getNotAfter()));

        logger.error(ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_EXPIRED,
            c.getSubjectDN().getName(), c.getNotAfter());
        throw cee;
      }
      catch (CertificateNotYetValidException cnyve)
      {
        logger.error(ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_NOT_YET_VALID, c
            .getSubjectDN().getName(), String.valueOf(c.getNotBefore()));

        logger.error(ERR_EXPCHECK_TRUSTMGR_SERVER_CERT_NOT_YET_VALID,
            c.getSubjectDN().getName(), c.getNotBefore());
        throw cnyve;
      }
    }

 opendj3-server-dev/src/server/org/opends/server/workflowelement/localbackend/LocalBackendBindOperation.java

@@ -1143,14 +1143,12 @@
        catch (Exception e)
        {
          logger.traceException(e);
          logger.error(cannotProcessAttributeMessage.get(v.getValue(),
              String.valueOf(userEntry.getName())));
          logger.error(cannotProcessAttributeMessage.get(v.getValue(), userEntry.getName()));
        }
      }
      else if (a.size() > 1)
      {
        logger.error(nonUniqueAttributeMessage.get(String
            .valueOf(userEntry.getName())));
        logger.error(nonUniqueAttributeMessage.get(userEntry.getName()));
      }
    }
    return null;