Removed now useless calls to String.valueOf() on arguments of ArgN.get(...).

Jean-Noel Rouvignac

03.10.2014 31216400c324b43c15b8a9eea6d89604247ebb14

 opendj3-server-dev/replace.rb

@@ -201,8 +201,41 @@
     ]
  }

  MSG_ARGN_TOSTRING = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
        /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\.toString\(\)/m,
        '\1',
      ]
  }

  MSG_ARGN_STRING_VALUEOF = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
        # Need to fix removing the last parentheses
        /([A-Z0-9_]+\s*\.\s*get\s*\([^;]*)\s*String\s*\.\s*valueOf\s*\(/m,
        '\1',
      ]
  }

  LOG_ISTRACEENABLED_TRACEEXCEPTION = {
    :dirs => JAVA_DIRS,
    :extensions => ["java"],
    :replacements =>
      [
        /if\s*\(\s*logger\s*\.\s*isTraceEnabled\s*\(\s*\)\s*\)\s*(logger\s*\.\s*trace(Exception)?\s*\(\s*\w+\s*\)\s*;)/,
        '\1',
        /if\s*\(\s*logger\s*\.\s*isTraceEnabled\s*\(\s*\)\s*\)\s*\{\s*(logger\s*\.\s*trace(Exception)?\s*\(\s*\w+\s*\)\s*;)\s*\}/,
        '\1',
      ]
  }

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


@@ -244,8 +277,11 @@
      (0..replacements.size-1).step(2).each { |index|
        pattern, replace = replacements[index], replacements[index+1]
        replace = replace.gsub('{CLASSNAME}', classname(file))
        is_replaced = contents.gsub!(pattern, replace)
        if is_replaced then count += 1 end
        is_replaced = true
        while is_replaced
          is_replaced = contents.gsub!(pattern, replace)
          if is_replaced then count += 1 end
        end
      }
      File.open(file + ".copy", "w+") { |f| f.write(contents) }
    }
@@ -386,5 +422,5 @@

# Launch all replacements defined in the REPLACEMENTS constant
#Replace.new.messages("src/messages/messages/admin.properties")
Replace.new.run_messages
#Replace.new.run
#Replace.new.run_messages
Replace.new.run

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AbstractBrowseEntriesPanel.java

@@ -1636,7 +1636,7 @@
          }
          final UserDataCertificateException udce =
            new UserDataCertificateException(null,
                INFO_CERTIFICATE_EXCEPTION.get(h, String.valueOf(p)),
                INFO_CERTIFICATE_EXCEPTION.get(h, p),
                ne, h, p,
                getInfo().getTrustManager().getLastRefusedChain(),
                getInfo().getTrustManager().getLastRefusedAuthType(),

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java

@@ -704,7 +704,7 @@
                }
                UserDataCertificateException udce =
                  new UserDataCertificateException(null,
                      INFO_CERTIFICATE_EXCEPTION.get(h, String.valueOf(p)),
                      INFO_CERTIFICATE_EXCEPTION.get(h, p),
                      throwable, h, p,
                      getInfo().getTrustManager().getLastRefusedChain(),
                      getInfo().getTrustManager().getLastRefusedAuthType(),

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LoginPanel.java

@@ -328,7 +328,7 @@
                }
                UserDataCertificateException udce =
                  new UserDataCertificateException(null,
                      INFO_CERTIFICATE_EXCEPTION.get(h, String.valueOf(p)),
                      INFO_CERTIFICATE_EXCEPTION.get(h, p),
                      throwable, h, p,
                      getInfo().getTrustManager().getLastRefusedChain(),
                      getInfo().getTrustManager().getLastRefusedAuthType(),

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/ReadOnlyConfigFileHandler.java

@@ -149,9 +149,8 @@
      }
      catch (Throwable t)
      {
        LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_OPEN_FOR_READ.get(
            f.getAbsolutePath(), String.valueOf(t));
        throw new InitializationException(message, t);
        throw new InitializationException(
            ERR_CONFIG_FILE_CANNOT_OPEN_FOR_READ.get(f.getAbsolutePath(), t), t);
      }

      if (! f.exists())
@@ -223,16 +222,13 @@
      }
      catch (LDIFException le)
      {
        LocalizableMessage message = ERR_CONFIG_FILE_INVALID_LDIF_ENTRY.get(
            le.getLineNumber(), f.getAbsolutePath(),
            String.valueOf(le));
        throw new InitializationException(message, le);
        throw new InitializationException(
            ERR_CONFIG_FILE_INVALID_LDIF_ENTRY.get(le.getLineNumber(), f.getAbsolutePath(), le), le);
      }
      catch (Throwable t)
      {
        LocalizableMessage message = ERR_CONFIG_FILE_READ_ERROR.get(f.getAbsolutePath(),
            String.valueOf(t));
        throw new InitializationException(message, t);
        throw new InitializationException(
            ERR_CONFIG_FILE_READ_ERROR.get(f.getAbsolutePath(), t), t);
      }



 opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java

@@ -1260,7 +1260,7 @@
              "--"+parser.getSecureArgsList().adminUidArg.getLongIdentifier(),
              "--"+ToolConstants.OPTION_LONG_BINDPWD,
              "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
              String.valueOf(exceptionMsg)));
              exceptionMsg));
        }
        else
        {
@@ -1272,7 +1272,7 @@
                  "--"+ToolConstants.OPTION_LONG_BINDPWD,
                  "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
                  "--"+parser.forceOnErrorArg.getLongIdentifier(),
                  String.valueOf(exceptionMsg)));
                  exceptionMsg));
        }
      }
      else

 opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java

@@ -1769,7 +1769,7 @@
            }
            UserDataCertificateException exc =
              new UserDataCertificateException(Step.REPLICATION_OPTIONS,
                INFO_CERTIFICATE_EXCEPTION.get(h, String.valueOf(p)),
                INFO_CERTIFICATE_EXCEPTION.get(h, p),
                e.getCause(), h, p,
                e.getTrustManager().getLastRefusedChain(),
                e.getTrustManager().getLastRefusedAuthType(), excType);

 opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/ui/LoginDialog.java

@@ -479,7 +479,7 @@
              }
              UserDataCertificateException udce =
              new UserDataCertificateException(Step.REPLICATION_OPTIONS,
                  INFO_CERTIFICATE_EXCEPTION.get(h, String.valueOf(p)),
                  INFO_CERTIFICATE_EXCEPTION.get(h, p),
                  throwable, h, p,
                  getTrustManager().getLastRefusedChain(),
                  getTrustManager().getLastRefusedAuthType(), excType);

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/CurrentInstallStatus.java

@@ -75,8 +75,7 @@

      if (installation.getStatus().isServerRunning())
      {
        msgs.add(INFO_INSTALLSTATUS_SERVERRUNNING.get(
                String.valueOf(getPort())));
        msgs.add(INFO_INSTALLSTATUS_SERVERRUNNING.get(getPort()));
      }

      if (dbFilesExist())

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/Installer.java

@@ -1447,15 +1447,13 @@
    if (isVerbose() || (nEntries > THRESHOLD_AUTOMATIC_DATA_VERBOSE))
    {
      mb.append(getFormattedProgress(
            INFO_PROGRESS_IMPORT_AUTOMATICALLY_GENERATED.get(
                    String.valueOf(nEntries))));
            INFO_PROGRESS_IMPORT_AUTOMATICALLY_GENERATED.get(nEntries)));
      mb.append(getLineBreak());
    }
    else
    {
      mb.append(getFormattedProgress(
          INFO_PROGRESS_IMPORT_AUTOMATICALLY_GENERATED_NON_VERBOSE.get(
                  String.valueOf(nEntries))));
          INFO_PROGRESS_IMPORT_AUTOMATICALLY_GENERATED_NON_VERBOSE.get(nEntries)));
    }
    notifyListeners(mb.toMessage());

@@ -2018,8 +2016,7 @@
            notifyListeners(getFormattedWarning(
                INFO_WARNING_SERVERS_CLOCK_DIFFERENCE.get(
                    localServerDisplay, ConnectionUtils.getHostPort(ctx),
                    String.valueOf(
                        THRESHOLD_CLOCK_DIFFERENCE_WARNING))));
                    THRESHOLD_CLOCK_DIFFERENCE_WARNING)));
          }
        }

@@ -3043,7 +3040,7 @@
          {
            long requiredInMb = getRequiredInstallSpace() / (1024 * 1024);
            errorMsgs.add(INFO_NOT_ENOUGH_DISK_SPACE.get(
                    existingParentDirectory, String.valueOf(requiredInMb)));
                    existingParentDirectory, requiredInMb));
            qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
          }
          else
@@ -3069,8 +3066,7 @@
      } else if (!hasEnoughSpace(serverLocation, getRequiredInstallSpace()))
      {
        long requiredInMb = getRequiredInstallSpace() / (1024 * 1024);
        errorMsgs.add(INFO_NOT_ENOUGH_DISK_SPACE.get(
                serverLocation, String.valueOf(requiredInMb)));
        errorMsgs.add(INFO_NOT_ENOUGH_DISK_SPACE.get(serverLocation, requiredInMb));
        qs.displayFieldInvalid(FieldName.SERVER_LOCATION, true);
      } else if (isWindows() && (serverLocation.contains("%")))
      {
@@ -3105,9 +3101,7 @@
      port = Integer.parseInt(sPort);
      if ((port < MIN_PORT_VALUE) || (port > MAX_PORT_VALUE))
      {
        errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(
                String.valueOf(MIN_PORT_VALUE),
                String.valueOf(MAX_PORT_VALUE)));
        errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(MIN_PORT_VALUE, MAX_PORT_VALUE));
        qs.displayFieldInvalid(FieldName.SERVER_PORT, true);
      } else if (!canUseAsPort(port))
      {
@@ -3118,11 +3112,9 @@
        getUserData().setServerPort(port);
        qs.displayFieldInvalid(FieldName.SERVER_PORT, false);
      }

    } catch (NumberFormatException nfe)
    {
      errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(
              String.valueOf(MIN_PORT_VALUE), String.valueOf(MAX_PORT_VALUE)));
      errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(MIN_PORT_VALUE, MAX_PORT_VALUE));
      qs.displayFieldInvalid(FieldName.SERVER_PORT, true);
    }

@@ -3135,9 +3127,7 @@
      if ((adminConnectorPort < MIN_PORT_VALUE) ||
          (adminConnectorPort > MAX_PORT_VALUE))
      {
        errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(
                String.valueOf(MIN_PORT_VALUE),
                String.valueOf(MAX_PORT_VALUE)));
        errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(MIN_PORT_VALUE, MAX_PORT_VALUE));
        qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, true);
      } else if (!canUseAsPort(adminConnectorPort))
      {
@@ -3157,8 +3147,7 @@
      }
    } catch (NumberFormatException nfe)
    {
      errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(
              String.valueOf(MIN_PORT_VALUE), String.valueOf(MAX_PORT_VALUE)));
      errorMsgs.add(INFO_INVALID_PORT_VALUE_RANGE.get(MIN_PORT_VALUE, MAX_PORT_VALUE));
      qs.displayFieldInvalid(FieldName.ADMIN_CONNECTOR_PORT, true);
    }

@@ -3170,9 +3159,7 @@
    {
      if ((securePort < MIN_PORT_VALUE) || (securePort > MAX_PORT_VALUE))
      {
        errorMsgs.add(INFO_INVALID_SECURE_PORT_VALUE_RANGE.get(
                String.valueOf(MIN_PORT_VALUE),
                String.valueOf(MAX_PORT_VALUE)));
        errorMsgs.add(INFO_INVALID_SECURE_PORT_VALUE_RANGE.get(MIN_PORT_VALUE, MAX_PORT_VALUE));
        qs.displayFieldInvalid(FieldName.SECURITY_OPTIONS, true);
      } else if (!canUseAsPort(securePort))
      {
@@ -3244,8 +3231,7 @@
    }
    if (pwd1.length() < MIN_DIRECTORY_MANAGER_PWD)
    {
      errorMsgs.add(INFO_PWD_TOO_SHORT.get(
              String.valueOf(MIN_DIRECTORY_MANAGER_PWD)));
      errorMsgs.add(INFO_PWD_TOO_SHORT.get(MIN_DIRECTORY_MANAGER_PWD));
      qs.displayFieldInvalid(FieldName.DIRECTORY_MANAGER_PWD, true);
      if ((pwd2 == null) || (pwd2.length() < MIN_DIRECTORY_MANAGER_PWD))
      {
@@ -3286,9 +3272,9 @@
  {
    if (isPriviledgedPort(port))
    {
      return INFO_CANNOT_BIND_PRIVILEDGED_PORT.get(String.valueOf(port));
      return INFO_CANNOT_BIND_PRIVILEDGED_PORT.get(port);
    }
    return INFO_CANNOT_BIND_PORT.get(String.valueOf(port));
    return INFO_CANNOT_BIND_PORT.get(port);
  }

  /**
@@ -3434,9 +3420,7 @@
      if ((replicationPort < MIN_PORT_VALUE) ||
          (replicationPort > MAX_PORT_VALUE))
      {
        errorMsgs.add(INFO_INVALID_REPLICATION_PORT_VALUE_RANGE.get(
                String.valueOf(MIN_PORT_VALUE),
                String.valueOf(MAX_PORT_VALUE)));
        errorMsgs.add(INFO_INVALID_REPLICATION_PORT_VALUE_RANGE.get(MIN_PORT_VALUE, MAX_PORT_VALUE));
        qs.displayFieldInvalid(FieldName.SERVER_PORT, true);
      } else if (!canUseAsPort(replicationPort))
      {
@@ -3462,8 +3446,7 @@

    } catch (NumberFormatException nfe)
    {
      errorMsgs.add(INFO_INVALID_REPLICATION_PORT_VALUE_RANGE.get(
              String.valueOf(MIN_PORT_VALUE), String.valueOf(MAX_PORT_VALUE)));
      errorMsgs.add(INFO_INVALID_REPLICATION_PORT_VALUE_RANGE.get(MIN_PORT_VALUE, MAX_PORT_VALUE));
      qs.displayFieldInvalid(FieldName.REPLICATION_PORT, true);
    }
    return replicationPort;
@@ -3614,8 +3597,7 @@
                }
                throw new UserDataCertificateException(
                        Step.REPLICATION_OPTIONS,
                        INFO_CERTIFICATE_EXCEPTION.get(
                                h, String.valueOf(p)),
                        INFO_CERTIFICATE_EXCEPTION.get(h, p),
                        e.getCause(), h, p,
                        e.getTrustManager().getLastRefusedChain(),
                        e.getTrustManager().getLastRefusedAuthType(), excType);
@@ -3667,7 +3649,7 @@
        if (excType != null)
        {
          throw new UserDataCertificateException(Step.REPLICATION_OPTIONS,
              INFO_CERTIFICATE_EXCEPTION.get(host, String.valueOf(port)), t,
              INFO_CERTIFICATE_EXCEPTION.get(host, port), t,
              host, port, trustManager.getLastRefusedChain(),
              trustManager.getLastRefusedAuthType(), excType);
        }
@@ -3754,8 +3736,7 @@
    }
    if (pwd1.length() < MIN_DIRECTORY_MANAGER_PWD)
    {
      errorMsgs.add(INFO_PWD_TOO_SHORT.get(
              String.valueOf(MIN_DIRECTORY_MANAGER_PWD)));
      errorMsgs.add(INFO_PWD_TOO_SHORT.get(MIN_DIRECTORY_MANAGER_PWD));
      qs.displayFieldInvalid(FieldName.GLOBAL_ADMINISTRATOR_PWD, true);
      if ((pwd2 == null) || (pwd2.length() < MIN_DIRECTORY_MANAGER_PWD))
      {
@@ -3872,9 +3853,7 @@
            (replicationPort > MAX_PORT_VALUE))
        {
          errorMsgs.add(INFO_INVALID_REMOTE_REPLICATION_PORT_VALUE_RANGE.get(
                  getHostPort(server),
                  String.valueOf(MIN_PORT_VALUE),
                  String.valueOf(MAX_PORT_VALUE)));
              getHostPort(server), MIN_PORT_VALUE, MAX_PORT_VALUE));
        }
        if (hostName.equalsIgnoreCase(getUserData().getHostName()))
        {
@@ -3901,8 +3880,7 @@
      } catch (NumberFormatException nfe)
      {
        errorMsgs.add(INFO_INVALID_REMOTE_REPLICATION_PORT_VALUE_RANGE.get(
                hostName, String.valueOf(MIN_PORT_VALUE),
                String.valueOf(MAX_PORT_VALUE)));
            hostName, MIN_PORT_VALUE, MAX_PORT_VALUE));
      }
    }

@@ -4016,8 +3994,7 @@
          if (!nEntriesValid)
          {
            errorMsgs.add(INFO_INVALID_NUMBER_ENTRIES_RANGE.get(
                String.valueOf(MIN_NUMBER_ENTRIES),
                String.valueOf(MAX_NUMBER_ENTRIES)));
                MIN_NUMBER_ENTRIES, MAX_NUMBER_ENTRIES));
            qs.displayFieldInvalid(FieldName.NUMBER_ENTRIES, true);
          } else
          {
@@ -4507,8 +4484,7 @@
          if (processed + unprocessed > 0)
          {
            long perc = (100 * processed) / (processed + unprocessed);
            msg = INFO_INITIALIZE_PROGRESS_WITH_PERCENTAGE.get(sProcessed,
                String.valueOf(perc));
            msg = INFO_INITIALIZE_PROGRESS_WITH_PERCENTAGE.get(sProcessed, perc);
          }
          else
          {

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java

@@ -426,8 +426,7 @@
      if (userInstallData.getReplicationOptions().useSecureReplication())
      {
        s = INFO_SECURE_REPLICATION_PORT_LABEL.get(
            String.valueOf(userInstallData.getReplicationOptions()
                .getReplicationPort())).toString();
            userInstallData.getReplicationOptions().getReplicationPort()).toString();
      }
      else
      {
@@ -450,8 +449,7 @@
        AuthenticationData repPort = remotePorts.get(server);
        if (repPort.useSecureConnection())
        {
          s = INFO_SECURE_REPLICATION_PORT_LABEL.get(
              String.valueOf(repPort.getPort())).toString();
          s = INFO_SECURE_REPLICATION_PORT_LABEL.get(repPort.getPort()).toString();
        }
        else
        {

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/SecurityOptionsDialog.java

@@ -914,21 +914,18 @@
            (port > Installer.MAX_PORT_VALUE))
        {
          errorMsgs.add(INFO_INVALID_SECURE_PORT_VALUE_RANGE.get(
                  String.valueOf(Installer.MIN_PORT_VALUE),
                  String.valueOf(Installer.MAX_PORT_VALUE)));
              Installer.MIN_PORT_VALUE, Installer.MAX_PORT_VALUE));

        }
        else if (!Utils.canUseAsPort(port))
        {
          if (Utils.isPriviledgedPort(port))
          {
            errorMsgs.add(INFO_CANNOT_BIND_PRIVILEDGED_PORT.get(
              String.valueOf(port)));
            errorMsgs.add(INFO_CANNOT_BIND_PRIVILEDGED_PORT.get(port));
          }
          else
          {
            errorMsgs.add(INFO_CANNOT_BIND_PORT.get(
              String.valueOf(port)));
            errorMsgs.add(INFO_CANNOT_BIND_PORT.get(port));
          }

        }
@@ -937,8 +934,7 @@
      catch (NumberFormatException nfe)
      {
        errorMsgs.add(INFO_INVALID_SECURE_PORT_VALUE_RANGE.get(
                String.valueOf(Installer.MIN_PORT_VALUE),
                String.valueOf(Installer.MAX_PORT_VALUE)));
            Installer.MIN_PORT_VALUE, Installer.MAX_PORT_VALUE));
      }
    }
    setValidLater(cbEnableSSL, errorMsgs.size() == 0);

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java

@@ -363,8 +363,7 @@

    if (nEntries > 0)
    {
      display = INFO_SUFFIX_LIST_REPLICA_DISPLAY_ENTRIES.get(
              serverDisplay, String.valueOf(nEntries));
      display = INFO_SUFFIX_LIST_REPLICA_DISPLAY_ENTRIES.get(serverDisplay, nEntries);
    }
    else if (nEntries == 0)
    {
@@ -372,8 +371,7 @@
    }
    else
    {
      display = INFO_SUFFIX_LIST_REPLICA_DISPLAY_ENTRIES_NOT_AVAILABLE.get(
              serverDisplay);
      display = INFO_SUFFIX_LIST_REPLICA_DISPLAY_ENTRIES_NOT_AVAILABLE.get(serverDisplay);
    }

    return display;

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java

@@ -283,16 +283,16 @@
    if (ce.getType() == UserDataCertificateException.Type.NOT_TRUSTED)
    {
      text = INFO_CERTIFICATE_NOT_TRUSTED_TEXT.get(
          ce.getHost(), String.valueOf(ce.getPort()),
          ce.getHost(), String.valueOf(ce.getPort()));
          ce.getHost(), ce.getPort(),
          ce.getHost(), ce.getPort());
    }
    else
    {
      text = INFO_CERTIFICATE_NAME_MISMATCH_TEXT.get(
              ce.getHost(), String.valueOf(ce.getPort()),
              ce.getHost(), ce.getPort(),
              ce.getHost(),
              ce.getHost(), String.valueOf(ce.getPort()),
              ce.getHost(), String.valueOf(ce.getPort()));
              ce.getHost(), ce.getPort(),
              ce.getHost(), ce.getPort());
    }
    JPanel p = UIFactory.makeJPanel();
    p.setLayout(new GridBagLayout());

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/GuiApplication.java

@@ -509,17 +509,13 @@
        switch (downloadStatus)
        {
        case VALIDATING:
          summary = INFO_VALIDATING_RATIO.get(
                  String.valueOf(perc),
                  String.valueOf(loader.getCurrentValidatingPercentage()));
          summary = INFO_VALIDATING_RATIO.get(perc, loader.getCurrentValidatingPercentage());
          break;
        case UPGRADING:
          summary = INFO_UPGRADING_RATIO.get(
                  String.valueOf(perc),
                  String.valueOf(loader.getCurrentUpgradingPercentage()));
          summary = INFO_UPGRADING_RATIO.get(perc, loader.getCurrentValidatingPercentage());
          break;
        default:
          summary = INFO_DOWNLOADING_RATIO.get(String.valueOf(perc));
          summary = INFO_DOWNLOADING_RATIO.get(perc);
        }
        loader.setSummary(summary);
        notifyListeners(ratio, summary, null);

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/FileManager.java

@@ -384,7 +384,7 @@
      // Just tell that the file/directory does not exist.
      if (application != null) {
        application.notifyListeners(application.getFormattedWarning(
                INFO_FILE_DOES_NOT_EXIST.get(String.valueOf(file))));
                INFO_FILE_DOES_NOT_EXIST.get(file)));
      }
      logger.debug(LocalizableMessage.raw("file '" + file + "' does not exist"));
    }

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/ServerController.java

@@ -260,9 +260,8 @@
               */
              throw new ApplicationException(
                  ReturnCode.STOP_ERROR,
                  INFO_ERROR_STOPPING_SERVER_CODE.get(
                      String.valueOf(returnValue)),
                      null);
                  INFO_ERROR_STOPPING_SERVER_CODE.get(returnValue),
                  null);
            }
          } else {
            if (application != null) {
@@ -380,8 +379,8 @@
        if (returnValue != 0)
        {
          throw new ApplicationException(ReturnCode.START_ERROR,
              INFO_ERROR_STARTING_SERVER_CODE.get(
                  String.valueOf(returnValue)), null);
              INFO_ERROR_STARTING_SERVER_CODE.get(returnValue),
              null);
        }
        if (outputReader.isFinished())
        {
@@ -521,17 +520,15 @@
            {
              throw new ApplicationException(
                  ReturnCode.START_ERROR,
                  INFO_ERROR_STARTING_SERVER_IN_WINDOWS.get(
                      String.valueOf(port)),
                      null);
                  INFO_ERROR_STARTING_SERVER_IN_WINDOWS.get(port),
                  null);
            }
            else
            {
              throw new ApplicationException(
                  ReturnCode.START_ERROR,
                  INFO_ERROR_STARTING_SERVER_IN_UNIX.get(
                      String.valueOf(port)),
                      null);
                  INFO_ERROR_STARTING_SERVER_IN_UNIX.get(port),
                  null);
            }
          }
        }

 opendj3-server-dev/src/quicksetup/org/opends/quicksetup/util/Utils.java

@@ -1792,7 +1792,7 @@

      case IMPORT_AUTOMATICALLY_GENERATED_DATA:
        arg2 = INFO_REVIEW_IMPORT_AUTOMATICALLY_GENERATED.get(
                String.valueOf(options.getNumberEntries()));
                options.getNumberEntries());
        break;

      default:
@@ -1872,7 +1872,7 @@
            buf.append("\n");
          }
        }
        buf.append(INFO_ENABLE_SSL.get(String.valueOf(ops.getSslPort())));
        buf.append(INFO_ENABLE_SSL.get(ops.getSslPort()));
      }
      if (html)
      {

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

@@ -561,12 +561,8 @@
      }

      if (!extensionsPath.isDirectory()) {
        // The extensions directory is not a directory. This is more
        // critical.
        LocalizableMessage message =
            ERR_ADMIN_EXTENSIONS_DIR_NOT_DIRECTORY.get(
                    String.valueOf(extensionsPath));
        throw new InitializationException(message);
        // The extensions directory is not a directory. This is more critical.
        throw new InitializationException(ERR_ADMIN_EXTENSIONS_DIR_NOT_DIRECTORY.get(extensionsPath));
      }

      // Get each extension file name.
@@ -595,7 +591,7 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_ADMIN_EXTENSIONS_CANNOT_LIST_FILES.get(
          String.valueOf(extensionsPath), stackTraceToSingleLineString(e));
          extensionsPath, stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }
@@ -707,9 +703,8 @@
      try {
        className = reader.readLine();
      } catch (IOException e) {
        LocalizableMessage msg = ERR_CLASS_LOADER_CANNOT_READ_MANIFEST_FILE.get(String
            .valueOf(e.getMessage()));
        throw new InitializationException(msg, e);
        throw new InitializationException(
            ERR_CLASS_LOADER_CANNOT_READ_MANIFEST_FILE.get(e.getMessage()), e);
      }

      // Break out when the end of the manifest is reached.
@@ -735,9 +730,8 @@
      try {
        theClass = Class.forName(className, true, loader);
      } catch (Exception e) {
        LocalizableMessage msg = ERR_CLASS_LOADER_CANNOT_LOAD_CLASS.get(className, String
            .valueOf(e.getMessage()));
        throw new InitializationException(msg, e);
        throw new InitializationException(
            ERR_CLASS_LOADER_CANNOT_LOAD_CLASS.get(className, e.getMessage()), e);
      }
      if (AbstractManagedObjectDefinition.class.isAssignableFrom(theClass)) {
        // We need to instantiate it using its getInstance() static method.
@@ -745,9 +739,8 @@
        try {
          method = theClass.getMethod("getInstance");
        } catch (Exception e) {
          LocalizableMessage msg = ERR_CLASS_LOADER_CANNOT_FIND_GET_INSTANCE_METHOD.get(
              className, String.valueOf(e.getMessage()));
          throw new InitializationException(msg, e);
          throw new InitializationException(
              ERR_CLASS_LOADER_CANNOT_FIND_GET_INSTANCE_METHOD.get(className, e.getMessage()), e);
        }

        // Get the definition instance.
@@ -755,9 +748,8 @@
        try {
          d = (AbstractManagedObjectDefinition<?, ?>) method.invoke(null);
        } catch (Exception e) {
          LocalizableMessage msg = ERR_CLASS_LOADER_CANNOT_INVOKE_GET_INSTANCE_METHOD.get(
              className, String.valueOf(e.getMessage()));
          throw new InitializationException(msg, e);
          throw new InitializationException(
              ERR_CLASS_LOADER_CANNOT_INVOKE_GET_INSTANCE_METHOD.get(className, e.getMessage()), e);
        }
        definitions.add(d);
      }
@@ -768,9 +760,9 @@
      try {
        d.initialize();
      } catch (Exception e) {
        LocalizableMessage msg = ERR_CLASS_LOADER_CANNOT_INITIALIZE_DEFN.get(d.getName(),
            d.getClass().getName(), String.valueOf(e.getMessage()));
        throw new InitializationException(msg, e);
        throw new InitializationException(
            ERR_CLASS_LOADER_CANNOT_INITIALIZE_DEFN.get(
                d.getName(), d.getClass().getName(), e.getMessage()), e);
      }
    }
  }

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

@@ -175,10 +175,8 @@
  // Create the message.
  private static LocalizableMessage createMessage(PropertyDefinition<?> pd, Object value)
  {
    PropertyDefinitionUsageBuilder builder = new PropertyDefinitionUsageBuilder(
        true);
    return ERR_ILLEGAL_PROPERTY_VALUE_EXCEPTION.get(String.valueOf(value),
        pd.getName(), builder.getUsage(pd));
    PropertyDefinitionUsageBuilder builder = new PropertyDefinitionUsageBuilder(true);
    return ERR_ILLEGAL_PROPERTY_VALUE_EXCEPTION.get(value, pd.getName(), builder.getUsage(pd));
  }



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

@@ -461,17 +461,13 @@
      if (configEntry != null) {
        return configEntry;
      } else {
        LocalizableMessage message = AdminMessages.ERR_ADMIN_MANAGED_OBJECT_DOES_NOT_EXIST
            .get(String.valueOf(dn));
        logger.error(message);
        logger.error(AdminMessages.ERR_ADMIN_MANAGED_OBJECT_DOES_NOT_EXIST.get(dn));
      }
    } catch (ConfigException e) {
      // The dependent entry could not be retrieved.
      logger.traceException(e);

      LocalizableMessage message = AdminMessages.ERR_ADMIN_CANNOT_GET_MANAGED_OBJECT.get(
          String.valueOf(dn), StaticUtils.getExceptionMessage(e));
      logger.error(message);
      logger.error(AdminMessages.ERR_ADMIN_CANNOT_GET_MANAGED_OBJECT.get(
          dn, StaticUtils.getExceptionMessage(e)));
    }

    return null;

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

@@ -25,19 +25,14 @@
 *      Portions Copyright 2014 ForgeRock AS
 */
package org.opends.server.admin.server;
import org.forgerock.i18n.LocalizableMessage;



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

import org.opends.server.admin.DefinitionDecodingException;
import org.opends.server.config.ConfigException;
import org.opends.messages.AdminMessages;
import org.opends.server.types.DN;



/**
 * A utility class for converting admin exceptions to config exceptions.
 */
@@ -78,9 +73,8 @@
   */
  public ConfigException createDecodingExceptionAdaptor(DN dn,
      DefinitionDecodingException e) {
    LocalizableMessage message = AdminMessages.ERR_ADMIN_MANAGED_OBJECT_DECODING_PROBLEM.
        get(String.valueOf(dn), stackTraceToSingleLineString(e));
    return new ConfigException(message, e);
    return new ConfigException(
        ERR_ADMIN_MANAGED_OBJECT_DECODING_PROBLEM.get(dn, stackTraceToSingleLineString(e)), e);
  }


@@ -97,11 +91,8 @@
  public ConfigException createDecodingExceptionAdaptor(
      ServerManagedObjectDecodingException e) {
    DN dn = e.getPartialManagedObject().getDN();
    LocalizableMessage message =
            AdminMessages.ERR_ADMIN_MANAGED_OBJECT_DECODING_PROBLEM.get(
                    String.valueOf(dn),
        stackTraceToSingleLineString(e));
    return new ConfigException(message, e);
    return new ConfigException(
        ERR_ADMIN_MANAGED_OBJECT_DECODING_PROBLEM.get(dn, stackTraceToSingleLineString(e)), e);
  }


@@ -117,9 +108,8 @@
  public ConfigException createDecodingExceptionAdaptor(
      ConstraintViolationException e) {
    DN dn = e.getManagedObject().getDN();
    LocalizableMessage message = AdminMessages.ERR_ADMIN_MANAGED_OBJECT_DECODING_PROBLEM
        .get(String.valueOf(dn), stackTraceToSingleLineString(e));
    return new ConfigException(message, e);
    return new ConfigException(
        ERR_ADMIN_MANAGED_OBJECT_DECODING_PROBLEM.get(dn, stackTraceToSingleLineString(e)), e);
  }


@@ -140,9 +130,7 @@

  public ConfigException createClassLoadingExceptionAdaptor(DN dn,
      String className, Exception e) {
    LocalizableMessage message = AdminMessages.ERR_ADMIN_CANNOT_INSTANTIATE_CLASS.
        get(String.valueOf(className), String.valueOf(dn),
            stackTraceToSingleLineString(e));
    return new ConfigException(message, e);
    return new ConfigException(
        ERR_ADMIN_CANNOT_INSTANTIATE_CLASS.get(className, dn, stackTraceToSingleLineString(e)), e);
  }
}

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

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

      LocalizableMessage message = ERR_ADMIN_CANNOT_GET_LISTENER_BASE.get(
          String.valueOf(dn), stackTraceToSingleLineString(e));
          dn, stackTraceToSingleLineString(e));
      throw new ConfigException(message, e);
    }

@@ -1393,8 +1393,7 @@
    }

    // No parent entry could be found.
    LocalizableMessage message = ERR_ADMIN_UNABLE_TO_REGISTER_LISTENER
        .get(String.valueOf(baseDN));
    LocalizableMessage message = ERR_ADMIN_UNABLE_TO_REGISTER_LISTENER.get(baseDN);
    throw new ConfigException(message);
  }


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

@@ -941,15 +941,14 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_ADMIN_CANNOT_GET_MANAGED_OBJECT.get(
          String.valueOf(dn), stackTraceToSingleLineString(e));
          dn, stackTraceToSingleLineString(e));
      throw new ConfigException(message, e);
    }

    // The configuration handler is free to return null indicating
    // that the entry does not exist.
    if (configEntry == null) {
      LocalizableMessage message = ERR_ADMIN_MANAGED_OBJECT_DOES_NOT_EXIST
          .get(String.valueOf(dn));
      LocalizableMessage message = ERR_ADMIN_MANAGED_OBJECT_DOES_NOT_EXIST.get(dn);
      throw new ConfigException(message);
    }


 opendj3-server-dev/src/server/org/opends/server/api/Backend.java

@@ -1085,11 +1085,8 @@
          {
            if (subBaseDNs.length > 1)
            {
              LocalizableMessage message =
                      ERR_BACKEND_CANNOT_REMOVE_MULTIBASE_SUB_SUFFIX.
                              get(String.valueOf(subSuffixDN),
                                      String.valueOf(parentDN));
              throw new ConfigException(message);
              throw new ConfigException(
                  ERR_BACKEND_CANNOT_REMOVE_MULTIBASE_SUB_SUFFIX.get(subSuffixDN, parentDN));
            }

            thisMatches = true;

 opendj3-server-dev/src/server/org/opends/server/api/CompressedSchema.java

@@ -26,8 +26,6 @@
 */
package org.opends.server.api;



import static org.opends.messages.CoreMessages.*;
import static org.opends.server.util.StaticUtils.toLowerCase;

@@ -44,7 +42,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeBuilder;
@@ -58,8 +55,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ObjectClass;



/**
 * This class provides a utility for interacting with compressed representations
 * of schema elements. The default implementation does not persist encoded
@@ -123,10 +118,8 @@
    Entry<AttributeType, Set<String>> ad = adDecodeMap.get(id);
    if (ad == null)
    {
      final LocalizableMessage message = ERR_COMPRESSEDSCHEMA_UNRECOGNIZED_AD_TOKEN
          .get(String.valueOf(id));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
          message);
          ERR_COMPRESSEDSCHEMA_UNRECOGNIZED_AD_TOKEN.get(id));
    }

    // Before returning the attribute, make sure that the attribute type is not
@@ -209,10 +202,8 @@
    }
    else
    {
      final LocalizableMessage message = ERR_COMPRESSEDSCHEMA_UNKNOWN_OC_TOKEN.get(String
          .valueOf(id));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
          message);
          ERR_COMPRESSEDSCHEMA_UNKNOWN_OC_TOKEN.get(id));
    }
  }


 opendj3-server-dev/src/server/org/opends/server/api/plugin/DirectoryServerPlugin.java

@@ -244,9 +244,8 @@
   */
  public PluginResult.Startup doStartup()
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        String.valueOf(pluginDN), PluginType.STARTUP.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.STARTUP.getName()).toString());
  }


@@ -262,9 +261,8 @@
   */
  public void doShutdown(LocalizableMessage reason)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        String.valueOf(pluginDN), PluginType.SHUTDOWN.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.SHUTDOWN.getName()).toString());
  }


@@ -283,9 +281,8 @@
  public PluginResult.PostConnect doPostConnect(ClientConnection
                                                    clientConnection)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        String.valueOf(pluginDN), PluginType.POST_CONNECT.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_CONNECT.getName()).toString());
  }


@@ -309,10 +306,8 @@
                               DisconnectReason disconnectReason,
                               LocalizableMessage message)
  {
    LocalizableMessage msg = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_DISCONNECT.getName());
    throw new UnsupportedOperationException(msg.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_DISCONNECT.getName()).toString());
  }


@@ -331,9 +326,8 @@
  public PluginResult.ImportLDIF
    doLDIFImport(LDIFImportConfig importConfig, Entry entry)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        String.valueOf(pluginDN), PluginType.LDIF_IMPORT.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.LDIF_IMPORT.getName()).toString());
  }

  /**
@@ -345,10 +339,8 @@
   */
  public void doLDIFImportEnd(LDIFImportConfig importConfig)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        String.valueOf(pluginDN),
        PluginType.LDIF_IMPORT_END.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.LDIF_IMPORT_END.getName()).toString());
  }

  /**
@@ -361,10 +353,8 @@
   */
  public void doLDIFImportBegin(LDIFImportConfig importConfig)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        String.valueOf(pluginDN),
        PluginType.LDIF_IMPORT_BEGIN.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.LDIF_IMPORT_BEGIN.getName()).toString());
  }

  /**
@@ -380,9 +370,8 @@
  public PluginResult.ImportLDIF
    doLDIFExport(LDIFExportConfig exportConfig, Entry entry)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        String.valueOf(pluginDN), PluginType.LDIF_EXPORT.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.LDIF_EXPORT.getName()).toString());
  }


@@ -399,10 +388,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseAbandonOperation abandonOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_PARSE_ABANDON.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_ABANDON.getName()).toString());
  }


@@ -420,10 +407,8 @@
  public PluginResult.PostOperation
       doPostOperation(PostOperationAbandonOperation abandonOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_ABANDON.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_ABANDON.getName()).toString());
  }


@@ -442,9 +427,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseAddOperation addOperation)
       throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        String.valueOf(pluginDN), PluginType.PRE_PARSE_ADD.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_ADD.getName()).toString());
  }


@@ -466,10 +450,8 @@
  public PluginResult.PreOperation
       doPreOperation(PreOperationAddOperation addOperation)
      throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_OPERATION_ADD.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_OPERATION_ADD.getName()).toString());
  }


@@ -488,10 +470,8 @@
  public PluginResult.PostOperation
       doPostOperation(PostOperationAddOperation addOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_ADD.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_ADD.getName()).toString());
  }


@@ -510,10 +490,8 @@
  public PluginResult.PostResponse
       doPostResponse(PostResponseAddOperation addOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_RESPONSE_ADD.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_RESPONSE_ADD.getName()).toString());
  }


@@ -529,10 +507,8 @@
  public void doPostSynchronization(
                   PostSynchronizationAddOperation addOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_SYNCHRONIZATION_ADD.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_SYNCHRONIZATION_ADD.getName()).toString());
  }


@@ -549,10 +525,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseBindOperation bindOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_PARSE_BIND.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_BIND.getName()).toString());
  }


@@ -569,10 +543,8 @@
  public PluginResult.PreOperation
       doPreOperation(PreOperationBindOperation bindOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_OPERATION_BIND.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_OPERATION_BIND.getName()).toString());
  }


@@ -591,10 +563,8 @@
  public PluginResult.PostOperation
       doPostOperation(PostOperationBindOperation bindOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_BIND.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_BIND.getName()).toString());
  }


@@ -613,10 +583,8 @@
  public PluginResult.PostResponse
       doPostResponse(PostResponseBindOperation bindOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_RESPONSE_BIND.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_RESPONSE_BIND.getName()).toString());
  }


@@ -636,10 +604,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseCompareOperation compareOperation)
       throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_PARSE_COMPARE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_COMPARE.getName()).toString());
  }


@@ -659,10 +625,8 @@
  public PluginResult.PreOperation
       doPreOperation(PreOperationCompareOperation compareOperation)
      throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_OPERATION_COMPARE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_OPERATION_COMPARE.getName()).toString());
  }


@@ -681,10 +645,8 @@
  public PluginResult.PostOperation
       doPostOperation(PostOperationCompareOperation compareOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_COMPARE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_COMPARE.getName()).toString());
  }


@@ -703,10 +665,8 @@
  public PluginResult.PostResponse
       doPostResponse(PostResponseCompareOperation compareOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_RESPONSE_COMPARE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_RESPONSE_COMPARE.getName()).toString());
  }


@@ -726,10 +686,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseDeleteOperation deleteOperation)
       throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_PARSE_DELETE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_DELETE.getName()).toString());
  }


@@ -751,10 +709,8 @@
  public PluginResult.PreOperation
       doPreOperation(PreOperationDeleteOperation deleteOperation)
      throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_OPERATION_DELETE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_OPERATION_DELETE.getName()).toString());
  }


@@ -773,10 +729,8 @@
  public PluginResult.PostOperation
       doPostOperation(PostOperationDeleteOperation deleteOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_DELETE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_DELETE.getName()).toString());
  }


@@ -795,10 +749,8 @@
  public PluginResult.PostResponse
       doPostResponse(PostResponseDeleteOperation deleteOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_RESPONSE_DELETE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_RESPONSE_DELETE.getName()).toString());
  }


@@ -814,10 +766,8 @@
  public void doPostSynchronization(
                   PostSynchronizationDeleteOperation deleteOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_SYNCHRONIZATION_DELETE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_SYNCHRONIZATION_DELETE.getName()).toString());
  }


@@ -837,10 +787,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseExtendedOperation extendedOperation)
       throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_PARSE_EXTENDED.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_EXTENDED.getName()).toString());
  }


@@ -861,10 +809,8 @@
  public PluginResult.PreOperation
       doPreOperation(PreOperationExtendedOperation extendedOperation)
      throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_OPERATION_EXTENDED.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_OPERATION_EXTENDED.getName()).toString());
  }


@@ -885,10 +831,8 @@
       doPostOperation(PostOperationExtendedOperation
                            extendedOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_EXTENDED.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_EXTENDED.getName()).toString());
  }


@@ -907,10 +851,8 @@
  public PluginResult.PostResponse
       doPostResponse(PostResponseExtendedOperation extendedOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_RESPONSE_EXTENDED.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_RESPONSE_EXTENDED.getName()).toString());
  }


@@ -930,10 +872,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseModifyOperation modifyOperation)
       throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_PARSE_MODIFY.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_MODIFY.getName()).toString());
  }


@@ -955,10 +895,8 @@
  public PluginResult.PreOperation
       doPreOperation(PreOperationModifyOperation modifyOperation)
      throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_OPERATION_MODIFY.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_OPERATION_MODIFY.getName()).toString());
  }


@@ -977,10 +915,8 @@
  public PluginResult.PostOperation
       doPostOperation(PostOperationModifyOperation modifyOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_MODIFY.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_MODIFY.getName()).toString());
  }


@@ -999,10 +935,8 @@
  public PluginResult.PostResponse
       doPostResponse(PostResponseModifyOperation modifyOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_RESPONSE_MODIFY.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_RESPONSE_MODIFY.getName()).toString());
  }


@@ -1018,10 +952,8 @@
  public void doPostSynchronization(
                   PostSynchronizationModifyOperation modifyOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_SYNCHRONIZATION_MODIFY.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_SYNCHRONIZATION_MODIFY.getName()).toString());
  }


@@ -1041,10 +973,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseModifyDNOperation modifyDNOperation)
       throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_PARSE_MODIFY_DN.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_MODIFY_DN.getName()).toString());
  }


@@ -1067,10 +997,8 @@
  public PluginResult.PreOperation
       doPreOperation(PreOperationModifyDNOperation modifyDNOperation)
      throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_OPERATION_MODIFY_DN.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_OPERATION_MODIFY_DN.getName()).toString());
  }


@@ -1107,10 +1035,8 @@
                                  Entry oldEntry, Entry newEntry,
                                  List<Modification> modifications)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
            String.valueOf(pluginDN),
            PluginType.SUBORDINATE_MODIFY_DN.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.SUBORDINATE_MODIFY_DN.getName()).toString());
  }


@@ -1129,10 +1055,8 @@
       processSubordinateDelete(DeleteOperation
         deleteOperation, Entry entry)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
            String.valueOf(pluginDN),
            PluginType.SUBORDINATE_MODIFY_DN.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.SUBORDINATE_MODIFY_DN.getName()).toString());
  }


@@ -1152,10 +1076,8 @@
       doPostOperation(PostOperationModifyDNOperation
                            modifyDNOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_MODIFY_DN.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_MODIFY_DN.getName()).toString());
  }


@@ -1174,10 +1096,8 @@
  public PluginResult.PostResponse
       doPostResponse(PostResponseModifyDNOperation modifyDNOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_RESPONSE_MODIFY_DN.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_RESPONSE_MODIFY_DN.getName()).toString());
  }


@@ -1194,10 +1114,8 @@
  public void doPostSynchronization(
              PostSynchronizationModifyDNOperation modifyDNOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_SYNCHRONIZATION_MODIFY_DN.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_SYNCHRONIZATION_MODIFY_DN.getName()).toString());
  }


@@ -1217,10 +1135,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseSearchOperation searchOperation)
       throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_PARSE_SEARCH.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_SEARCH.getName()).toString());
  }


@@ -1240,10 +1156,8 @@
  public PluginResult.PreOperation
       doPreOperation(PreOperationSearchOperation searchOperation)
      throws CanceledOperationException {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_OPERATION_SEARCH.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_OPERATION_SEARCH.getName()).toString());
  }


@@ -1268,10 +1182,8 @@
       processSearchEntry(SearchEntrySearchOperation searchOperation,
                          SearchResultEntry searchEntry)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.SEARCH_RESULT_ENTRY.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.SEARCH_RESULT_ENTRY.getName()).toString());
  }


@@ -1293,10 +1205,8 @@
                                   searchOperation,
                              SearchResultReference searchReference)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.SEARCH_RESULT_REFERENCE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.SEARCH_RESULT_REFERENCE.getName()).toString());
  }


@@ -1315,10 +1225,8 @@
  public PluginResult.PostOperation
       doPostOperation(PostOperationSearchOperation searchOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_SEARCH.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_SEARCH.getName()).toString());
  }


@@ -1337,10 +1245,8 @@
  public PluginResult.PostResponse
       doPostResponse(PostResponseSearchOperation searchOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_RESPONSE_SEARCH.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_RESPONSE_SEARCH.getName()).toString());
  }


@@ -1357,10 +1263,8 @@
  public PluginResult.PreParse
       doPreParse(PreParseUnbindOperation unbindOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.PRE_PARSE_UNBIND.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.PRE_PARSE_UNBIND.getName()).toString());
  }


@@ -1378,10 +1282,8 @@
  public PluginResult.PostOperation
       doPostOperation(PostOperationUnbindOperation unbindOperation)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.POST_OPERATION_UNBIND.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.POST_OPERATION_UNBIND.getName()).toString());
  }


@@ -1399,10 +1301,8 @@
              processIntermediateResponse(
                   IntermediateResponse intermediateResponse)
  {
    LocalizableMessage message = ERR_PLUGIN_TYPE_NOT_SUPPORTED.
        get(String.valueOf(pluginDN),
            PluginType.INTERMEDIATE_RESPONSE.getName());
    throw new UnsupportedOperationException(message.toString());
    throw new UnsupportedOperationException(ERR_PLUGIN_TYPE_NOT_SUPPORTED.get(
        pluginDN, PluginType.INTERMEDIATE_RESPONSE.getName()).toString());
  }
}


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

@@ -923,11 +923,8 @@
            }
            catch (AciException ex)
            {
              LocalizableMessage message =
                  WARN_ACI_MODIFY_FAILED_DECODE.get(String.valueOf(dn),
                      ex.getMessage());
              throw new DirectoryException(
                  ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                  WARN_ACI_MODIFY_FAILED_DECODE.get(dn, ex.getMessage()));
            }
          }
        }
@@ -1257,9 +1254,8 @@
    catch (Exception e)
    {
      logger.traceException(e);
      LocalizableMessage message = INFO_ACI_HANDLER_FAIL_PROCESS_GLOBAL_ACI.get(
          String.valueOf(configuration.dn()));
      throw new InitializationException(message, e);
      throw new InitializationException(
          INFO_ACI_HANDLER_FAIL_PROCESS_GLOBAL_ACI.get(configuration.dn()), e);
    }
  }

@@ -1467,10 +1463,9 @@
          }
          catch (AciException ex)
          {
            LocalizableMessage message = WARN_ACI_ADD_FAILED_DECODE.get(
                String.valueOf(entry.getName()), ex.getMessage());
            throw new DirectoryException(
                ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
                ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                WARN_ACI_ADD_FAILED_DECODE.get(entry.getName(), ex.getMessage()));
          }
        }
      }

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

@@ -1192,11 +1192,8 @@
      catch (Exception e)
      {
        logger.traceException(e);

        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(
            dnString, String.valueOf(e));
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(dnString, e));
      }
    }

@@ -1433,11 +1430,8 @@
    catch (Exception e)
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(
          dnString, String.valueOf(e));
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                   message);
          ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(dnString, e));
    }
  }
}

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

@@ -462,8 +462,8 @@
    DN parentDN = entryDN.getParentDNInSuffix();
    if (parentDN == null)
    {
      LocalizableMessage message = ERR_BACKUP_INVALID_BASE.get(String.valueOf(entryDN));
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          ERR_BACKUP_INVALID_BASE.get(entryDN));
    }
    else if (parentDN.equals(backupBaseDN))
    {
@@ -475,7 +475,7 @@
    }
    else
    {
      LocalizableMessage message = ERR_BACKUP_INVALID_BASE.get(String.valueOf(entryDN));
      LocalizableMessage message = ERR_BACKUP_INVALID_BASE.get(entryDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
              message, backupBaseDN, null);
    }
@@ -506,7 +506,7 @@
    if (v == null)
    {
      LocalizableMessage message =
          ERR_BACKUP_DN_DOES_NOT_SPECIFY_DIRECTORY.get(String.valueOf(entryDN));
          ERR_BACKUP_DN_DOES_NOT_SPECIFY_DIRECTORY.get(entryDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
                                   backupBaseDN, null);
    }
@@ -525,9 +525,8 @@
    {
      logger.traceException(ce);

      LocalizableMessage message = ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(
          String.valueOf(entryDN), ce.getMessage());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
          ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(entryDN, ce.getMessage()));
    }
    catch (Exception e)
    {
@@ -591,8 +590,7 @@
        true);
    AttributeValue idValue = entryDN.rdn().getAttributeValue(idType);
    if (idValue == null) {
      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_ID_IN_DN.get(String
          .valueOf(entryDN));
      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_ID_IN_DN.get(entryDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }
    String backupID = idValue.getValue().toString();
@@ -600,8 +598,7 @@
    // Next, get the backup directory from the parent DN.
    DN parentDN = entryDN.getParentDNInSuffix();
    if (parentDN == null) {
      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_PARENT_DN.get(String
          .valueOf(entryDN));
      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_PARENT_DN.get(entryDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }

@@ -609,8 +606,7 @@
        ATTR_BACKUP_DIRECTORY_PATH, true);
    AttributeValue v = parentDN.rdn().getAttributeValue(t);
    if (v == null) {
      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_DIR_IN_DN.get(String
          .valueOf(entryDN));
      LocalizableMessage message = ERR_BACKUP_NO_BACKUP_DIR_IN_DN.get(entryDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }

@@ -621,8 +617,7 @@
    } catch (ConfigException ce) {
      logger.traceException(ce);

      LocalizableMessage message = ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(String
          .valueOf(entryDN), ce.getMessageObject());
      LocalizableMessage message = ERR_BACKUP_INVALID_BACKUP_DIRECTORY.get(entryDN, ce.getMessageObject());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    } catch (Exception e) {
      logger.traceException(e);
@@ -956,9 +951,7 @@
      if ((parentDN == null)
          || (! backupBaseDN.equals(parentDN.getParentDNInSuffix())))
      {
        LocalizableMessage message = ERR_BACKUP_NO_SUCH_ENTRY.get(
                String.valueOf(backupBaseDN)
        );
        LocalizableMessage message = ERR_BACKUP_NO_SUCH_ENTRY.get(backupBaseDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }

@@ -968,8 +961,7 @@
        Entry backupEntry = getBackupEntry(baseDN);
        if (backupEntry == null)
        {
          LocalizableMessage message = ERR_BACKUP_NO_SUCH_ENTRY.get(
                  String.valueOf(backupBaseDN));
          LocalizableMessage message = ERR_BACKUP_NO_SUCH_ENTRY.get(backupBaseDN);
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
        }


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

@@ -403,9 +403,8 @@
        }
        else
        {
          LocalizableMessage m = ERR_LDIF_BACKEND_HAS_SUBORDINATES_NO_SUCH_ENTRY.get(
                           String.valueOf(entryDN));
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m);
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
              ERR_LDIF_BACKEND_HAS_SUBORDINATES_NO_SUCH_ENTRY.get(entryDN));
        }
      }
      else
@@ -441,9 +440,8 @@
        }
        else
        {
          LocalizableMessage m = ERR_LDIF_BACKEND_NUM_SUBORDINATES_NO_SUCH_ENTRY.get(
                           String.valueOf(entryDN));
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m);
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
              ERR_LDIF_BACKEND_NUM_SUBORDINATES_NO_SUCH_ENTRY.get(entryDN));
        }
      }
      else
@@ -794,9 +792,8 @@
      DN newParentDN = newDN.getParentDNInSuffix();
      if (! entryMap.containsKey(newParentDN))
      {
        LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_NEW_PARENT_DOESNT_EXIST.get(
                         String.valueOf(newParentDN));
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
            ERR_LDIF_BACKEND_MODDN_NEW_PARENT_DOESNT_EXIST.get(newParentDN));
      }

      // Remove the entry from the list of children for the old parent and
@@ -923,8 +920,7 @@
          matchedDN = matchedDN.getParentDNInSuffix();
        }

        LocalizableMessage m = ERR_LDIF_BACKEND_SEARCH_NO_SUCH_BASE.get(
                         String.valueOf(baseDN));
        LocalizableMessage m = ERR_LDIF_BACKEND_SEARCH_NO_SUCH_BASE.get(baseDN);
        throw new DirectoryException(
                ResultCode.NO_SUCH_OBJECT, m, matchedDN, null);
      }
@@ -1030,8 +1026,7 @@
      catch (Exception e)
      {
        LocalizableMessage m = ERR_LDIF_BACKEND_CANNOT_WRITE_ENTRY_TO_LDIF.get(
                         String.valueOf(entryDN),
                         stackTraceToSingleLineString(e));
            entryDN, stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     m, e);
      }

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

@@ -404,9 +404,8 @@
    DN entryDN = e.getName();
    if (entryMap.containsKey(entryDN))
    {
      LocalizableMessage message =
          ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(String.valueOf(entryDN));
      throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
      throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
          ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(entryDN));
    }


@@ -422,15 +421,13 @@
    DN parentDN = entryDN.getParentDNInSuffix();
    if (parentDN == null)
    {
      LocalizableMessage message =
          ERR_MEMORYBACKEND_ENTRY_DOESNT_BELONG.get(String.valueOf(entryDN));
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          ERR_MEMORYBACKEND_ENTRY_DOESNT_BELONG.get(entryDN));
    }
    else if (! entryMap.containsKey(parentDN))
    {
      LocalizableMessage message = ERR_MEMORYBACKEND_PARENT_DOESNT_EXIST.get(
          String.valueOf(entryDN), String.valueOf(parentDN));
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          ERR_MEMORYBACKEND_PARENT_DOESNT_EXIST.get(entryDN, parentDN));
    }

    entryMap.put(entryDN, e);
@@ -457,9 +454,8 @@
    // Make sure the entry exists.  If not, then throw an exception.
    if (! entryMap.containsKey(entryDN))
    {
      LocalizableMessage message =
          ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(String.valueOf(entryDN));
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(entryDN));
    }


@@ -500,10 +496,8 @@
      // an exception.
      if ((children != null) && (! children.isEmpty()))
      {
        LocalizableMessage message = ERR_MEMORYBACKEND_CANNOT_DELETE_ENTRY_WITH_CHILDREN.
            get(String.valueOf(entryDN));
        throw new DirectoryException(
                ResultCode.NOT_ALLOWED_ON_NONLEAF, message);
        throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_NONLEAF,
            ERR_MEMORYBACKEND_CANNOT_DELETE_ENTRY_WITH_CHILDREN.get(entryDN));
      }
    }

@@ -543,9 +537,8 @@
    DN entryDN = e.getName();
    if (! entryMap.containsKey(entryDN))
    {
      LocalizableMessage message =
          ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(String.valueOf(entryDN));
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(entryDN));
    }


@@ -568,9 +561,8 @@
    // Make sure that the target entry exists.
    if (! entryMap.containsKey(currentDN))
    {
      LocalizableMessage message =
          ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(String.valueOf(currentDN));
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(currentDN));
    }


@@ -584,10 +576,8 @@
      }
      else
      {
        LocalizableMessage message = ERR_MEMORYBACKEND_CANNOT_RENAME_ENRY_WITH_CHILDREN.
            get(String.valueOf(currentDN));
        throw new DirectoryException(
                ResultCode.NOT_ALLOWED_ON_NONLEAF, message);
        throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_NONLEAF,
            ERR_MEMORYBACKEND_CANNOT_RENAME_ENRY_WITH_CHILDREN.get(currentDN));
      }
    }

@@ -595,9 +585,8 @@
    // Make sure that no entry exists with the new DN.
    if (entryMap.containsKey(e.getName()))
    {
      LocalizableMessage message = ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(
          String.valueOf(e.getName()));
      throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
      throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
          ERR_MEMORYBACKEND_ENTRY_ALREADY_EXISTS.get(e.getName()));
    }


@@ -614,9 +603,8 @@

    if (! matchFound)
    {
      LocalizableMessage message = ERR_MEMORYBACKEND_CANNOT_RENAME_TO_ANOTHER_BACKEND.get(
          String.valueOf(currentDN));
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
          ERR_MEMORYBACKEND_CANNOT_RENAME_TO_ANOTHER_BACKEND.get(currentDN));
    }


@@ -624,9 +612,8 @@
    DN parentDN = e.getName().getParentDNInSuffix();
    if ((parentDN == null) || (! entryMap.containsKey(parentDN)))
    {
      LocalizableMessage message = ERR_MEMORYBACKEND_RENAME_PARENT_DOESNT_EXIST.get(
          String.valueOf(currentDN), String.valueOf(parentDN));
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          ERR_MEMORYBACKEND_RENAME_PARENT_DOESNT_EXIST.get(currentDN, parentDN));
    }


@@ -665,8 +652,7 @@
        matchedDN = matchedDN.getParentDNInSuffix();
      }

      LocalizableMessage message =
          ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(String.valueOf(baseDN));
      LocalizableMessage message = ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(baseDN);
      throw new DirectoryException(
              ResultCode.NO_SUCH_OBJECT, message, matchedDN, null);
    }
@@ -752,10 +738,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_WRITER.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_WRITER.get(e), e);
    }


@@ -771,10 +755,8 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_MEMORYBACKEND_CANNOT_WRITE_ENTRY_TO_LDIF.get(
          String.valueOf(entryDN), String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
          ERR_MEMORYBACKEND_CANNOT_WRITE_ENTRY_TO_LDIF.get(entryDN, e), e);
    }
    finally
    {
@@ -818,10 +800,8 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message =
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(e), e);
    }


@@ -842,11 +822,8 @@
        {
          if (! le.canContinueReading())
          {
            LocalizableMessage message =
                ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(String.valueOf(e));
            throw new DirectoryException(
                           DirectoryServer.getServerErrorResultCode(),
                           message, le);
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(e), le);
          }
          else
          {
@@ -874,10 +851,8 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message =
          ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
          ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(e), e);
    }
    finally
    {

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

@@ -112,9 +112,8 @@
  public void addEntry(final Entry entry, final AddOperation addOperation)
      throws DirectoryException
  {
    final LocalizableMessage message = ERR_MONITOR_ADD_NOT_SUPPORTED.get(String
        .valueOf(entry.getName()));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_MONITOR_ADD_NOT_SUPPORTED.get(entry.getName()));
  }


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

      messages.add(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
          String.valueOf(configEntryDN), stackTraceToSingleLineString(e)));
          configEntryDN, stackTraceToSingleLineString(e)));
      resultCode = DirectoryServer.getServerErrorResultCode();
    }

@@ -285,9 +284,8 @@
  public void deleteEntry(final DN entryDN,
      final DeleteOperation deleteOperation) throws DirectoryException
  {
    final LocalizableMessage message = ERR_MONITOR_DELETE_NOT_SUPPORTED.get(String
        .valueOf(entryDN));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_MONITOR_DELETE_NOT_SUPPORTED.get(entryDN));
  }


@@ -450,9 +448,8 @@
    final Map<DN, MonitorProvider<?>> dit = getDIT();
    if (!dit.containsKey(entryDN))
    {
      final LocalizableMessage message = ERR_MONITOR_INVALID_BASE.get(
          String.valueOf(entryDN), String.valueOf(baseMonitorDN));
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          ERR_MONITOR_INVALID_BASE.get(entryDN, baseMonitorDN));
    }

    // The DN is associated with a valid monitor/glue entry.
@@ -667,9 +664,8 @@
  public void renameEntry(final DN currentDN, final Entry entry,
      final ModifyDNOperation modifyDNOperation) throws DirectoryException
  {
    final LocalizableMessage message = ERR_MONITOR_MODIFY_DN_NOT_SUPPORTED.get(String
        .valueOf(currentDN));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_MONITOR_MODIFY_DN_NOT_SUPPORTED.get(currentDN));
  }


@@ -681,9 +677,8 @@
  public void replaceEntry(final Entry oldEntry, final Entry newEntry,
      final ModifyOperation modifyOperation) throws DirectoryException
  {
    final LocalizableMessage message = ERR_MONITOR_MODIFY_NOT_SUPPORTED.get(
        String.valueOf(newEntry.getName()), String.valueOf(configEntryDN));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_MONITOR_MODIFY_NOT_SUPPORTED.get(newEntry.getName(), configEntryDN));
  }


@@ -730,8 +725,7 @@
        }
        matchedDN = matchedDN.parent();
      }
      final LocalizableMessage message = ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(String
          .valueOf(baseDN));
      final LocalizableMessage message = ERR_MEMORYBACKEND_ENTRY_DOESNT_EXIST.get(baseDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
          matchedDN, null);
    }

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

@@ -1049,9 +1049,8 @@
  public void addEntry(Entry entry, AddOperation addOperation)
         throws DirectoryException
  {
    LocalizableMessage message =
        ERR_ROOTDSE_ADD_NOT_SUPPORTED.get(String.valueOf(entry.getName()));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_ROOTDSE_ADD_NOT_SUPPORTED.get(entry.getName()));
  }


@@ -1063,9 +1062,8 @@
  public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
         throws DirectoryException
  {
    LocalizableMessage message =
        ERR_ROOTDSE_DELETE_NOT_SUPPORTED.get(String.valueOf(entryDN));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_ROOTDSE_DELETE_NOT_SUPPORTED.get(entryDN));
  }


@@ -1077,9 +1075,8 @@
  public void replaceEntry(Entry oldEntry, Entry newEntry,
      ModifyOperation modifyOperation) throws DirectoryException
  {
    LocalizableMessage message = ERR_ROOTDSE_MODIFY_NOT_SUPPORTED.get(
        String.valueOf(newEntry.getName()), String.valueOf(configEntryDN));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_ROOTDSE_MODIFY_NOT_SUPPORTED.get(newEntry.getName(), configEntryDN));
  }


@@ -1092,9 +1089,8 @@
                                   ModifyDNOperation modifyDNOperation)
         throws DirectoryException
  {
    LocalizableMessage message =
        ERR_ROOTDSE_MODIFY_DN_NOT_SUPPORTED.get(String.valueOf(currentDN));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_ROOTDSE_MODIFY_DN_NOT_SUPPORTED.get(currentDN));
  }


@@ -1109,8 +1105,7 @@
    if (! baseDN.isRootDN())
    {
      LocalizableMessage message = ERR_ROOTDSE_INVALID_SEARCH_BASE.
          get(searchOperation.getConnectionID(),
              searchOperation.getOperationID(), String.valueOf(baseDN));
          get(searchOperation.getConnectionID(), searchOperation.getOperationID(), baseDN);
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    }

@@ -1218,7 +1213,7 @@
        LocalizableMessage message = ERR_ROOTDSE_INVALID_SEARCH_SCOPE.
            get(searchOperation.getConnectionID(),
                searchOperation.getOperationID(),
                String.valueOf(searchOperation.getScope()));
                searchOperation.getScope());
        throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }
  }
@@ -1457,9 +1452,7 @@
          Backend backend = DirectoryServer.getBackend(baseDN);
          if (backend == null)
          {
            LocalizableMessage message = WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE.get(
                    String.valueOf(baseDN));
            unacceptableReasons.add(message);
            unacceptableReasons.add(WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE.get(baseDN));
            configIsAcceptable = false;
          }
        }
@@ -1469,9 +1462,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message = WARN_ROOTDSE_SUBORDINATE_BASE_EXCEPTION.get(
              stackTraceToSingleLineString(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(WARN_ROOTDSE_SUBORDINATE_BASE_EXCEPTION.get(
          stackTraceToSingleLineString(e)));
      configIsAcceptable = false;
    }

@@ -1511,9 +1503,7 @@
          if (backend == null)
          {
            // This is not fine.  We can't use a suffix that doesn't exist.
            LocalizableMessage message = WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE.get(
                    String.valueOf(baseDN));
            messages.add(message);
            messages.add(WARN_ROOTDSE_NO_BACKEND_FOR_SUBORDINATE_BASE.get(baseDN));

            if (resultCode == ResultCode.SUCCESS)
            {
@@ -1581,8 +1571,7 @@
      logger.traceException(e);

      messages.add(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
              String.valueOf(configEntryDN),
              stackTraceToSingleLineString(e)));
              configEntryDN, stackTraceToSingleLineString(e)));
      resultCode = DirectoryServer.getServerErrorResultCode();
    }

@@ -1616,16 +1605,13 @@
      if (showAllAttributes != newShowAll)
      {
        showAllAttributes = newShowAll;
        LocalizableMessage message = INFO_ROOTDSE_UPDATED_SHOW_ALL_ATTRS.get(
                ATTR_ROOTDSE_SHOW_ALL_ATTRIBUTES,
                String.valueOf(showAllAttributes));
        messages.add(message);
        messages.add(INFO_ROOTDSE_UPDATED_SHOW_ALL_ATTRS.get(
                ATTR_ROOTDSE_SHOW_ALL_ATTRIBUTES, showAllAttributes));
      }


      userDefinedAttributes = userAttrs;
      LocalizableMessage message = INFO_ROOTDSE_USING_NEW_USER_ATTRS.get();
      messages.add(message);
      messages.add(INFO_ROOTDSE_USING_NEW_USER_ATTRS.get());
    }



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

@@ -1075,9 +1075,8 @@
  public void addEntry(Entry entry, AddOperation addOperation)
         throws DirectoryException
  {
    LocalizableMessage message =
        ERR_SCHEMA_ADD_NOT_SUPPORTED.get(String.valueOf(entry.getName()));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_SCHEMA_ADD_NOT_SUPPORTED.get(entry.getName()));
  }


@@ -1089,9 +1088,8 @@
  public void deleteEntry(DN entryDN, DeleteOperation deleteOperation)
         throws DirectoryException
  {
    LocalizableMessage message =
        ERR_SCHEMA_DELETE_NOT_SUPPORTED.get(String.valueOf(entryDN));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_SCHEMA_DELETE_NOT_SUPPORTED.get(entryDN));
  }


@@ -1501,10 +1499,8 @@
          if ((!m.isInternal()) &&
              (!modifyOperation.isSynchronizationOperation()))
          {
            LocalizableMessage message = ERR_SCHEMA_INVALID_MODIFICATION_TYPE.get(
                String.valueOf(m.getModificationType()));
            throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
                message);
                ERR_SCHEMA_INVALID_MODIFICATION_TYPE.get(m.getModificationType()));
          }
          else
          {
@@ -1523,10 +1519,8 @@
          break;

        default:
          LocalizableMessage message = ERR_SCHEMA_INVALID_MODIFICATION_TYPE.get(
              String.valueOf(m.getModificationType()));
          throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
              message);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
              ERR_SCHEMA_INVALID_MODIFICATION_TYPE.get(m.getModificationType()));
      }
    }

@@ -4097,9 +4091,8 @@
                                   ModifyDNOperation modifyDNOperation)
         throws DirectoryException
  {
    LocalizableMessage message =
        ERR_SCHEMA_MODIFY_DN_NOT_SUPPORTED.get(String.valueOf(currentDN));
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
        ERR_SCHEMA_MODIFY_DN_NOT_SUPPORTED.get(currentDN));
  }


@@ -4132,7 +4125,7 @@

    if (! found)
    {
      LocalizableMessage message = ERR_SCHEMA_INVALID_BASE.get(String.valueOf(baseDN));
      LocalizableMessage message = ERR_SCHEMA_INVALID_BASE.get(baseDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
              matchedDN, null);
    }
@@ -4273,10 +4266,8 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message =
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
          ERR_MEMORYBACKEND_CANNOT_CREATE_LDIF_READER.get(e), e);
    }


@@ -4297,11 +4288,9 @@
        {
          if (! le.canContinueReading())
          {
            LocalizableMessage message =
                ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(String.valueOf(e));
            throw new DirectoryException(
                           DirectoryServer.getServerErrorResultCode(),
                           message, le);
                DirectoryServer.getServerErrorResultCode(),
                ERR_MEMORYBACKEND_ERROR_READING_LDIF.get(e), le);
          }
          else
          {
@@ -4322,10 +4311,8 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message =
          ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
          ERR_MEMORYBACKEND_ERROR_DURING_IMPORT.get(e), e);
    }
    finally
    {
@@ -4730,8 +4717,7 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_SCHEMA_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
          get(String.valueOf(filename), backupDirectory.getPath(),
              getExceptionMessage(e));
          get(filename, backupDirectory.getPath(), getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
    }
@@ -5256,8 +5242,7 @@
      {
        LocalizableMessage message = ERR_SCHEMA_RESTORE_CANNOT_RENAME_CURRENT_DIRECTORY.
            get(backupID, schemaInstanceDirPath,
                String.valueOf(backupInstanceDirPath),
                stackTraceToSingleLineString(e));
                backupInstanceDirPath, stackTraceToSingleLineString(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message, e);
      }
@@ -5557,8 +5542,7 @@


      messages.add(ERR_SCHEMA_CANNOT_DETERMINE_BASE_DN.get(
              String.valueOf(configEntryDN),
              getExceptionMessage(e)));
          configEntryDN, getExceptionMessage(e)));
      resultCode = DirectoryServer.getServerErrorResultCode();
      newBaseDNs = null;
    }
@@ -5602,8 +5586,7 @@
      logger.traceException(e);

      messages.add(ERR_CONFIG_BACKEND_ERROR_INTERACTING_WITH_BACKEND_ENTRY.get(
              String.valueOf(configEntryDN),
              stackTraceToSingleLineString(e)));
          configEntryDN, stackTraceToSingleLineString(e)));
      resultCode = DirectoryServer.getServerErrorResultCode();
    }

@@ -5633,16 +5616,13 @@
        try
        {
          DirectoryServer.deregisterBaseDN(dn);
          messages.add(INFO_SCHEMA_DEREGISTERED_BASE_DN.get(
                  String.valueOf(dn)));
          messages.add(INFO_SCHEMA_DEREGISTERED_BASE_DN.get(dn));
        }
        catch (Exception e)
        {
          logger.traceException(e);

          messages.add(ERR_SCHEMA_CANNOT_DEREGISTER_BASE_DN.get(
                  String.valueOf(dn),
                  getExceptionMessage(e)));
          messages.add(ERR_SCHEMA_CANNOT_DEREGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
          resultCode = DirectoryServer.getServerErrorResultCode();
        }
      }
@@ -5653,15 +5633,13 @@
        try
        {
          DirectoryServer.registerBaseDN(dn, this, true);
          messages.add(INFO_SCHEMA_REGISTERED_BASE_DN.get(String.valueOf(dn)));
          messages.add(INFO_SCHEMA_REGISTERED_BASE_DN.get(dn));
        }
        catch (Exception e)
        {
          logger.traceException(e);

          messages.add(ERR_SCHEMA_CANNOT_REGISTER_BASE_DN.get(
                  String.valueOf(dn),
                  getExceptionMessage(e)));
          messages.add(ERR_SCHEMA_CANNOT_REGISTER_BASE_DN.get(dn, getExceptionMessage(e)));
          resultCode = DirectoryServer.getServerErrorResultCode();
        }
      }

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

@@ -167,9 +167,7 @@
    SortedSet<DN> baseDNSet = configuration.getBaseDN();
    if (baseDNSet.size() != 1)
    {
      LocalizableMessage message = ERR_TRUSTSTORE_REQUIRES_ONE_BASE_DN.get(
           String.valueOf(configEntryDN));
      throw new InitializationException(message);
      throw new InitializationException(ERR_TRUSTSTORE_REQUIRES_ONE_BASE_DN.get(configEntryDN));
    }
    baseDN = baseDNSet.first();
    baseDNs = new DN[] {baseDN};
@@ -193,11 +191,8 @@
    catch (KeyStoreException kse)
    {
      logger.traceException(kse);

      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_TYPE.
          get(String.valueOf(trustStoreType), String.valueOf(configEntryDN),
              getExceptionMessage(kse));
      throw new InitializationException(message);
      throw new InitializationException(ERR_TRUSTSTORE_INVALID_TYPE.get(
          trustStoreType, configEntryDN, getExceptionMessage(kse)));
    }


@@ -247,9 +242,8 @@
            }
            catch (Exception e)
            {
              LocalizableMessage message = ERR_TRUSTSTORE_PIN_FILE_CANNOT_CREATE.get(
                   String.valueOf(pinFilePath), String.valueOf(configEntryDN));
              throw new InitializationException(message);
              throw new InitializationException(
                  ERR_TRUSTSTORE_PIN_FILE_CANNOT_CREATE.get(pinFilePath, configEntryDN));
            }
          }
          else
@@ -265,8 +259,7 @@
            catch (IOException ioe)
            {
              LocalizableMessage message = ERR_TRUSTSTORE_PIN_FILE_CANNOT_READ.
                  get(String.valueOf(pinFilePath),
                      String.valueOf(configEntryDN), getExceptionMessage(ioe));
                  get(pinFilePath, configEntryDN, getExceptionMessage(ioe));
              throw new InitializationException(message, ioe);
            }
            finally
@@ -281,9 +274,8 @@

            if (pinStr == null)
            {
              LocalizableMessage message = ERR_TRUSTSTORE_PIN_FILE_EMPTY.get(
                  String.valueOf(pinFilePath), String.valueOf(configEntryDN));
              throw new InitializationException(message);
              throw new InitializationException(
                  ERR_TRUSTSTORE_PIN_FILE_EMPTY.get(pinFilePath, configEntryDN));
            }
            else
            {
@@ -297,9 +289,8 @@
        String pinStr = System.getenv(pinEnVar);
        if (pinStr == null)
        {
          LocalizableMessage message = ERR_TRUSTSTORE_PIN_ENVAR_NOT_SET.get(
              String.valueOf(pinProperty), String.valueOf(configEntryDN));
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_TRUSTSTORE_PIN_ENVAR_NOT_SET.get(pinProperty, configEntryDN));
        }
        else
        {
@@ -312,9 +303,7 @@
      String pinStr = System.getProperty(pinProperty);
      if (pinStr == null)
      {
        LocalizableMessage message = ERR_TRUSTSTORE_PIN_PROPERTY_NOT_SET.get(
            String.valueOf(pinProperty), String.valueOf(configEntryDN));
        throw new InitializationException(message);
        throw new InitializationException(ERR_TRUSTSTORE_PIN_PROPERTY_NOT_SET.get(pinProperty, configEntryDN));
      }
      else
      {
@@ -376,10 +365,7 @@
    catch (Exception e)
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
          String.valueOf(baseDN), String.valueOf(e));
      throw new InitializationException(message, e);
      throw new InitializationException(ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(baseDN, e), e);
    }
  }

@@ -536,10 +522,8 @@
    AttributeValue v = entryDN.rdn().getAttributeValue(t);
    if (v == null)
    {
      LocalizableMessage message = ERR_TRUSTSTORE_DN_DOES_NOT_SPECIFY_CERTIFICATE.
           get(String.valueOf(entryDN));
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
                                   baseDN, null);
      LocalizableMessage message = ERR_TRUSTSTORE_DN_DOES_NOT_SPECIFY_CERTIFICATE.get(entryDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message, baseDN, null);
    }

    String certAlias = v.getValue().toString();
@@ -549,8 +533,7 @@
      Certificate cert = certificateManager.getCertificate(certAlias);
      if (cert == null)
      {
        LocalizableMessage message = ERR_TRUSTSTORE_CERTIFICATE_NOT_FOUND.get(
            String.valueOf(entryDN), certAlias);
        LocalizableMessage message = ERR_TRUSTSTORE_CERTIFICATE_NOT_FOUND.get(entryDN, certAlias);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }
      certValue = ByteString.wrap(cert.getEncoded());
@@ -612,16 +595,14 @@

    if (entryDN.equals(baseDN))
    {
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(
           String.valueOf(entryDN));
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(entryDN);
      throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
    }

    DN parentDN = entryDN.getParentDNInSuffix();
    if (parentDN == null)
    {
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(
           String.valueOf(entryDN));
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(entryDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
    }

@@ -631,11 +612,9 @@
    }
    else
    {
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(
           String.valueOf(entryDN));
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(entryDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
    }

  }


@@ -649,16 +628,14 @@
  {
    if (entryDN.equals(baseDN))
    {
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(
           String.valueOf(entryDN));
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(entryDN);
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    }

    DN parentDN = entryDN.getParentDNInSuffix();
    if (parentDN == null || !parentDN.equals(baseDN))
    {
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(
           String.valueOf(entryDN));
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(entryDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
    }

@@ -779,7 +756,7 @@
    }
    else
    {
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(String.valueOf(baseDN));
      LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(baseDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
    }
  }
@@ -982,9 +959,7 @@
      File f = getFileForPath(newTrustStoreFile);
      if (!(f.exists() && f.isFile()))
      {
        unacceptableReasons.add(ERR_TRUSTSTORE_NO_SUCH_FILE.get(
                String.valueOf(newTrustStoreFile),
                String.valueOf(cfgEntryDN)));
        unacceptableReasons.add(ERR_TRUSTSTORE_NO_SUCH_FILE.get(newTrustStoreFile, cfgEntryDN));
        configAcceptable = false;
      }
    }
@@ -992,9 +967,7 @@
    {
      logger.traceException(e);

      unacceptableReasons.add(ERR_TRUSTSTORE_CANNOT_DETERMINE_FILE.get(
              String.valueOf(cfgEntryDN),
              getExceptionMessage(e)));
      unacceptableReasons.add(ERR_TRUSTSTORE_CANNOT_DETERMINE_FILE.get(cfgEntryDN, getExceptionMessage(e)));
      configAcceptable = false;
    }

@@ -1011,11 +984,8 @@
      {
        logger.traceException(kse);

        LocalizableMessage message = ERR_TRUSTSTORE_INVALID_TYPE.get(
                String.valueOf(storeType),
                String.valueOf(cfgEntryDN),
                getExceptionMessage(kse));
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_TRUSTSTORE_INVALID_TYPE.get(
            storeType, cfgEntryDN, getExceptionMessage(kse)));
        configAcceptable = false;
      }
    }
@@ -1028,10 +998,7 @@
    {
      if (System.getProperty(pinProp) == null)
      {
        LocalizableMessage message = ERR_TRUSTSTORE_PIN_PROPERTY_NOT_SET.get(
                String.valueOf(pinProp),
                String.valueOf(cfgEntryDN));
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_TRUSTSTORE_PIN_PROPERTY_NOT_SET.get(pinProp, cfgEntryDN));
        configAcceptable = false;
      }
    }
@@ -1044,10 +1011,7 @@
    {
      if (System.getenv(pinEnVar) == null)
      {
        LocalizableMessage message = ERR_TRUSTSTORE_PIN_ENVAR_NOT_SET.get(
                String.valueOf(pinEnVar),
                String.valueOf(cfgEntryDN));
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_TRUSTSTORE_PIN_ENVAR_NOT_SET.get(pinEnVar, cfgEntryDN));
        configAcceptable = false;
      }
    }
@@ -1070,11 +1034,8 @@
        }
        catch (IOException ioe)
        {
          LocalizableMessage message = ERR_TRUSTSTORE_PIN_FILE_CANNOT_READ.get(
                  String.valueOf(pinFile),
                  String.valueOf(cfgEntryDN),
                  getExceptionMessage(ioe));
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_TRUSTSTORE_PIN_FILE_CANNOT_READ.get(
              pinFile, cfgEntryDN, getExceptionMessage(ioe)));
          configAcceptable = false;
        }
        finally
@@ -1089,10 +1050,7 @@

        if (pinStr == null)
        {
          LocalizableMessage message =  ERR_TRUSTSTORE_PIN_FILE_EMPTY.get(
                  String.valueOf(pinFile),
                  String.valueOf(cfgEntryDN));
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_TRUSTSTORE_PIN_FILE_EMPTY.get(pinFile, cfgEntryDN));
          configAcceptable = false;
        }
      }
@@ -1121,9 +1079,7 @@
    {
      resultCode = DirectoryServer.getServerErrorResultCode();

      messages.add(ERR_TRUSTSTORE_NO_SUCH_FILE.get(
              String.valueOf(newTrustStoreFile),
              String.valueOf(configEntryDN)));
      messages.add(ERR_TRUSTSTORE_NO_SUCH_FILE.get(newTrustStoreFile, configEntryDN));
    }


@@ -1143,11 +1099,7 @@
    {
      logger.traceException(kse);

      messages.add(ERR_TRUSTSTORE_INVALID_TYPE.get(
              String.valueOf(newTrustStoreType),
              String.valueOf(configEntryDN),
              getExceptionMessage(kse)));

      messages.add(ERR_TRUSTSTORE_INVALID_TYPE.get(newTrustStoreType, configEntryDN, getExceptionMessage(kse)));
      resultCode = DirectoryServer.getServerErrorResultCode();
    }

@@ -1198,10 +1150,7 @@
            catch (Exception e)
            {
              resultCode = DirectoryServer.getServerErrorResultCode();

              messages.add(ERR_TRUSTSTORE_PIN_FILE_CANNOT_CREATE.get(
                      String.valueOf(newPINFile),
                      String.valueOf(configEntryDN)));
              messages.add(ERR_TRUSTSTORE_PIN_FILE_CANNOT_CREATE.get(newPINFile, configEntryDN));
            }
          }
          else
@@ -1217,11 +1166,8 @@
            catch (IOException ioe)
            {
              resultCode = DirectoryServer.getServerErrorResultCode();

              messages.add(ERR_TRUSTSTORE_PIN_FILE_CANNOT_READ.get(
                      String.valueOf(newPINFile),
                      String.valueOf(configEntryDN),
                      getExceptionMessage(ioe)));
                  newPINFile, configEntryDN, getExceptionMessage(ioe)));
            }
            finally
            {
@@ -1236,10 +1182,7 @@
            if (pinStr == null)
            {
              resultCode = DirectoryServer.getServerErrorResultCode();

              messages.add(ERR_TRUSTSTORE_PIN_FILE_EMPTY.get(
                      String.valueOf(newPINFile),
                      String.valueOf(configEntryDN)));
              messages.add(ERR_TRUSTSTORE_PIN_FILE_EMPTY.get(newPINFile, configEntryDN));
            }
            else
            {
@@ -1254,10 +1197,7 @@
        if (pinStr == null)
        {
          resultCode = DirectoryServer.getServerErrorResultCode();

          messages.add(ERR_TRUSTSTORE_PIN_ENVAR_NOT_SET.get(
                  String.valueOf(newPINEnVar),
                  String.valueOf(configEntryDN)));
          messages.add(ERR_TRUSTSTORE_PIN_ENVAR_NOT_SET.get(newPINEnVar, configEntryDN));
        }
        else
        {
@@ -1271,10 +1211,7 @@
      if (pinStr == null)
      {
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_TRUSTSTORE_PIN_PROPERTY_NOT_SET.get(
                String.valueOf(newPINProperty),
                String.valueOf(configEntryDN)));
        messages.add(ERR_TRUSTSTORE_PIN_PROPERTY_NOT_SET.get(newPINProperty, configEntryDN));
      }
      else
      {
@@ -1525,10 +1462,8 @@
    AttributeValue v = entryDN.rdn().getAttributeValue(t);
    if (v == null)
    {
      LocalizableMessage message = ERR_TRUSTSTORE_DN_DOES_NOT_SPECIFY_CERTIFICATE.get(
           String.valueOf(entryDN));
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
                                   baseDN, null);
      LocalizableMessage message = ERR_TRUSTSTORE_DN_DOES_NOT_SPECIFY_CERTIFICATE.get(entryDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message, baseDN, null);
    }
    String certAlias = v.getValue().toString();

@@ -1536,10 +1471,8 @@
    {
      if (certificateManager.aliasInUse(certAlias))
      {
        LocalizableMessage message = ERR_TRUSTSTORE_ALIAS_IN_USE.get(
             String.valueOf(entryDN));
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
                                     message);
        LocalizableMessage message = ERR_TRUSTSTORE_ALIAS_IN_USE.get(entryDN);
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
      }

      ObjectClass ocSelfSignedCertRequest =
@@ -1568,18 +1501,14 @@
        if (certAttrs == null)
        {
          LocalizableMessage message =
               ERR_TRUSTSTORE_ENTRY_MISSING_CERT_ATTR.get(
                    String.valueOf(entryDN),
                    ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
               ERR_TRUSTSTORE_ENTRY_MISSING_CERT_ATTR.get(entryDN, ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message);
        }
        if (certAttrs.size() != 1)
        {
          LocalizableMessage message =
               ERR_TRUSTSTORE_ENTRY_HAS_MULTIPLE_CERT_ATTRS.get(
                    String.valueOf(entryDN),
                    ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
               ERR_TRUSTSTORE_ENTRY_HAS_MULTIPLE_CERT_ATTRS.get(entryDN, ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message);
        }
@@ -1590,9 +1519,7 @@
        if (!i.hasNext())
        {
          LocalizableMessage message =
               ERR_TRUSTSTORE_ENTRY_MISSING_CERT_VALUE.get(
                    String.valueOf(entryDN),
                    ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
               ERR_TRUSTSTORE_ENTRY_MISSING_CERT_VALUE.get(entryDN, ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message);
        }
@@ -1602,9 +1529,7 @@
        if (i.hasNext())
        {
          LocalizableMessage message =
               ERR_TRUSTSTORE_ENTRY_HAS_MULTIPLE_CERT_VALUES.get(
                    String.valueOf(entryDN),
                    ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
               ERR_TRUSTSTORE_ENTRY_HAS_MULTIPLE_CERT_VALUES.get(entryDN, ATTR_CRYPTO_PUBLIC_KEY_CERTIFICATE);
          throw new DirectoryException(
               DirectoryServer.getServerErrorResultCode(), message);
        }
@@ -1663,10 +1588,8 @@
    AttributeValue v = entryDN.rdn().getAttributeValue(t);
    if (v == null)
    {
      LocalizableMessage message = ERR_TRUSTSTORE_DN_DOES_NOT_SPECIFY_CERTIFICATE.get(
           String.valueOf(entryDN));
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
                                   baseDN, null);
      LocalizableMessage message = ERR_TRUSTSTORE_DN_DOES_NOT_SPECIFY_CERTIFICATE.get(entryDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message, baseDN, null);
    }
    String certAlias = v.getValue().toString();

@@ -1674,10 +1597,8 @@
    {
      if (!certificateManager.aliasInUse(certAlias))
      {
        LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(
             String.valueOf(entryDN));
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
                                     message);
        LocalizableMessage message = ERR_TRUSTSTORE_INVALID_BASE.get(entryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }

      certificateManager.removeCertificate(certAlias);

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

@@ -156,9 +156,7 @@
    {
      if (attrType.getEqualityMatchingRule() == null)
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
            String.valueOf(attrType), "equality");
        throw new ConfigException(message);
        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "equality"));
      }

      Indexer equalityIndexer = new EqualityIndexer(attrType);
@@ -191,9 +189,7 @@
    {
      if (attrType.getSubstringMatchingRule() == null)
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
            String.valueOf(attrType), "substring");
        throw new ConfigException(message);
        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "substring"));
      }

      Indexer substringIndexer = new SubstringIndexer(attrType,
@@ -213,9 +209,7 @@
    {
      if (attrType.getOrderingMatchingRule() == null)
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
            String.valueOf(attrType), "ordering");
        throw new ConfigException(message);
        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "ordering"));
      }

      Indexer orderingIndexer = new OrderingIndexer(attrType);
@@ -233,9 +227,7 @@
    {
      if (attrType.getApproximateMatchingRule() == null)
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
            String.valueOf(attrType), "approximate");
        throw new ConfigException(message);
        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "approximate"));
      }

      Indexer approximateIndexer = new ApproximateIndexer(attrType);
@@ -255,9 +247,7 @@
              indexConfig.getIndexExtensibleMatchingRule();
      if(extensibleRules == null || extensibleRules.isEmpty())
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
            String.valueOf(attrType), "extensible");
        throw new ConfigException(message);
        throw new ConfigException(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "extensible"));
      }
      extensibleIndexes = new ExtensibleMatchingRuleIndex();
      //Iterate through the Set and create the index only if necessary.
@@ -1750,9 +1740,7 @@
    {
      if (equalityIndex == null && attrType.getEqualityMatchingRule() == null)
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
                String.valueOf(String.valueOf(attrType)), "equality");
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "equality"));
        return false;
      }
    }
@@ -1761,9 +1749,7 @@
    {
      if (substringIndex == null && attrType.getSubstringMatchingRule() == null)
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
                String.valueOf(attrType), "substring");
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "substring"));
        return false;
      }

@@ -1773,9 +1759,7 @@
    {
      if (orderingIndex == null && attrType.getOrderingMatchingRule() == null)
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
                String.valueOf(attrType), "ordering");
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "ordering"));
        return false;
      }
    }
@@ -1784,9 +1768,7 @@
      if (approximateIndex == null &&
          attrType.getApproximateMatchingRule() == null)
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
                String.valueOf(attrType), "approximate");
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "approximate"));
        return false;
      }
    }
@@ -1796,9 +1778,7 @@
              cfg.getIndexExtensibleMatchingRule();
      if (newRules == null || newRules.isEmpty())
      {
        LocalizableMessage message = ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(
                String.valueOf(attrType), "extensible");
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_CONFIG_INDEX_TYPE_NEEDS_MATCHING_RULE.get(attrType, "extensible"));
        return false;
      }
    }

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

@@ -306,10 +306,7 @@
      catch (Exception e)
      {
        logger.traceException(e);

        LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
            String.valueOf(dn), String.valueOf(e));
        throw new InitializationException(message, e);
        throw new InitializationException(ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(dn, e), e);
      }
    }

@@ -1233,10 +1230,7 @@
    try {
      Level.parse(cfg.getDBLoggingLevel());
    } catch (Exception e) {
      LocalizableMessage message = ERR_JEB_INVALID_LOGGING_LEVEL.get(
              String.valueOf(cfg.getDBLoggingLevel()),
              String.valueOf(cfg.dn()));
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_JEB_INVALID_LOGGING_LEVEL.get(cfg.getDBLoggingLevel(), cfg.dn()));
      return false;
    }

@@ -1299,11 +1293,7 @@
              logger.traceException(e);

              resultCode = DirectoryServer.getServerErrorResultCode();


              messages.add(ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
                      String.valueOf(baseDN),
                      String.valueOf(e)));
              messages.add(ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(baseDN, e));
              return new ConfigChangeResult(resultCode, false, messages);
            }
          }

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

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

      LocalizableMessage message = ERR_JEB_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
          get(String.valueOf(archiveFilename), backupDir.getPath(),
              stackTraceToSingleLineString(e));
          get(archiveFilename, backupDir.getPath(), stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
    }

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

@@ -511,10 +511,7 @@
    }
    catch (Exception e)
    {
      throw new ConfigException(
              ERR_JEB_INVALID_LOGGING_LEVEL.get(
              String.valueOf(cfg.getDBLoggingLevel()),
              String.valueOf(cfg.dn())));
      throw new ConfigException(ERR_JEB_INVALID_LOGGING_LEVEL.get(cfg.getDBLoggingLevel(), cfg.dn()));
    }

    final Level level = cfg.isDBLoggingFileHandlerOn() ? Level.ALL : Level.OFF;

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

@@ -497,8 +497,7 @@
    }

    // Throw a directory referral exception containing the URIs.
    LocalizableMessage msg =
        NOTE_JEB_REFERRAL_RESULT_MESSAGE.get(String.valueOf(referralDN));
    LocalizableMessage msg = NOTE_JEB_REFERRAL_RESULT_MESSAGE.get(referralDN);
    throw new DirectoryException(
            ResultCode.REFERRAL, msg, referralDN, URIList, null);
  }

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

@@ -344,8 +344,7 @@
        catch(Exception e)
        {
          LocalizableMessage msg =
            ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(
                String.valueOf(sortKeys[i]), cfg.getName());
            ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], cfg.getName());
          unacceptableReasons.add(msg);
          return false;
        }

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

@@ -102,10 +102,8 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_ENTRYIDSORTER_CANNOT_EXAMINE_ENTRY.get(
            String.valueOf(id), getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message, e);
        LocalizableMessage message = ERR_ENTRYIDSORTER_CANNOT_EXAMINE_ENTRY.get(id, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      }
    }


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

@@ -181,10 +181,7 @@
      }
      catch(Exception e)
      {
        LocalizableMessage msg =
            ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(
                    String.valueOf(sortKeys[i]), name);
        throw new ConfigException(msg);
        throw new ConfigException(ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
      }

      AttributeType attrType =
@@ -1735,10 +1732,7 @@
      }
      catch(Exception e)
      {
        LocalizableMessage msg =
                ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(
                        String.valueOf(sortKeys[i]), name);
        unacceptableReasons.add(msg);
        unacceptableReasons.add(ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
        return false;
      }

@@ -1848,9 +1842,7 @@
        }
        catch(Exception e)
        {
          LocalizableMessage msg = ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(
                  String.valueOf(String.valueOf(sortKeys[i])), name);
          messages.add(msg);
          messages.add(ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
          if(resultCode == ResultCode.SUCCESS)
          {
            resultCode = ResultCode.INVALID_ATTRIBUTE_SYNTAX;
@@ -1861,9 +1853,7 @@
            DirectoryServer.getAttributeType(sortAttrs[i].toLowerCase());
        if(attrType == null)
        {
          LocalizableMessage msg = ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(
                  String.valueOf(String.valueOf(sortKeys[i])), name);
          messages.add(msg);
          messages.add(ERR_JEB_CONFIG_VLV_INDEX_UNDEFINED_ATTR.get(sortKeys[i], name));
          if(resultCode == ResultCode.SUCCESS)
          {
            resultCode = ResultCode.INVALID_ATTRIBUTE_SYNTAX;

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

@@ -268,9 +268,7 @@
    recursiveDelete(tempDir);
    if (!tempDir.exists() && !tempDir.mkdirs())
    {
      LocalizableMessage message =
          ERR_JEB_IMPORT_CREATE_TMPDIR_ERROR.get(String.valueOf(tempDir));
      throw new InitializationException(message);
      throw new InitializationException(ERR_JEB_IMPORT_CREATE_TMPDIR_ERROR.get(tempDir));
    }
    this.skipDNValidation = true;
    initializeDBEnv(envConfig);
@@ -336,9 +334,7 @@
    recursiveDelete(tempDir);
    if (!tempDir.exists() && !tempDir.mkdirs())
    {
      LocalizableMessage message =
          ERR_JEB_IMPORT_CREATE_TMPDIR_ERROR.get(String.valueOf(tempDir));
      throw new InitializationException(message);
      throw new InitializationException(ERR_JEB_IMPORT_CREATE_TMPDIR_ERROR.get(tempDir));
    }
    skipDNValidation = importConfiguration.getSkipDNValidation();
    initializeDBEnv(envConfig);

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

@@ -302,10 +302,8 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_LOAD_CLASS.
          get(String.valueOf(taskClassName), ATTR_TASK_CLASS,
              getExceptionMessage(e));
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
                                   e);
          get(taskClassName, ATTR_TASK_CLASS, getExceptionMessage(e));
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message, e);
    }


@@ -319,9 +317,8 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_INSTANTIATE_CLASS_AS_TASK.get(
          String.valueOf(taskClassName), Task.class.getName());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message,
                                   e);
          taskClassName, Task.class.getName());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message, e);
    }


@@ -335,10 +332,8 @@
    {
      logger.traceException(ie);

      LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_INITIALIZE_INTERNAL.get(
          String.valueOf(taskClassName), ie.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, ie);
      LocalizableMessage message = ERR_RECURRINGTASK_CANNOT_INITIALIZE_INTERNAL.get( taskClassName, ie.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, ie);
    }

    task.initializeTask();

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

@@ -192,9 +192,7 @@
    {
      if (recurringTaskID == null)
      {
        LocalizableMessage message = ERR_TASK_MISSING_ATTR.get(
            String.valueOf(taskEntry.getName()), ATTR_TASK_ID);
        throw new InitializationException(message);
        throw new InitializationException(ERR_TASK_MISSING_ATTR.get(taskEntry.getName(), ATTR_TASK_ID));
      }
      else
      {
@@ -375,9 +373,7 @@
    {
      if (isRequired)
      {
        LocalizableMessage message = ERR_TASK_MISSING_ATTR.get(
            String.valueOf(taskEntry.getName()), attributeName);
        throw new InitializationException(message);
        throw new InitializationException(ERR_TASK_MISSING_ATTR.get(taskEntry.getName(), attributeName));
      }
      else
      {
@@ -387,9 +383,7 @@

    if (attrList.size() > 1)
    {
      LocalizableMessage message = ERR_TASK_MULTIPLE_ATTRS_FOR_TYPE.get(
          attributeName, String.valueOf(taskEntry.getName()));
      throw new InitializationException(message);
      throw new InitializationException(ERR_TASK_MULTIPLE_ATTRS_FOR_TYPE.get(attributeName, taskEntry.getName()));
    }

    Iterator<AttributeValue> iterator = attrList.get(0).iterator();
@@ -397,9 +391,7 @@
    {
      if (isRequired)
      {
        LocalizableMessage message = ERR_TASK_NO_VALUES_FOR_ATTR.get(
            attributeName, String.valueOf(taskEntry.getName()));
        throw new InitializationException(message);
        throw new InitializationException(ERR_TASK_NO_VALUES_FOR_ATTR.get(attributeName, taskEntry.getName()));
      }
      else
      {
@@ -410,9 +402,7 @@
    AttributeValue value = iterator.next();
    if (iterator.hasNext())
    {
      LocalizableMessage message = ERR_TASK_MULTIPLE_VALUES_FOR_ATTR.get(
          attributeName, String.valueOf(taskEntry.getName()));
      throw new InitializationException(message);
      throw new InitializationException(ERR_TASK_MULTIPLE_VALUES_FOR_ATTR.get(attributeName, taskEntry.getName()));
    }

    return value.getValue().toString();
@@ -447,9 +437,7 @@

    if (attrList.size() > 1)
    {
      LocalizableMessage message = ERR_TASK_MULTIPLE_ATTRS_FOR_TYPE.get(
          attributeName, String.valueOf(taskEntry.getName()));
      throw new InitializationException(message);
      throw new InitializationException(ERR_TASK_MULTIPLE_ATTRS_FOR_TYPE.get(attributeName, taskEntry.getName()));
    }

    Iterator<AttributeValue> iterator = attrList.get(0).iterator();
@@ -1231,10 +1219,8 @@
        String actualStartDate = new Date(actualStartTime).toString();
        String completionDate  = new Date(completionTime).toString();

        message.setBody(INFO_TASK_COMPLETION_BODY.get(taskID,
                                   String.valueOf(taskState),
                                   scheduledStartDate, actualStartDate,
                                   completionDate));
        message.setBody(INFO_TASK_COMPLETION_BODY.get(
            taskID, taskState, scheduledStartDate, actualStartDate, completionDate));

        for (String logMessage : logMessages)
        {

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

@@ -179,7 +179,7 @@

        // This should never happen.
        LocalizableMessage message = ERR_TASKBE_CANNOT_DECODE_RECURRING_TASK_BASE_DN.get(
            String.valueOf(recurringTaskBaseString), getExceptionMessage(e));
            recurringTaskBaseString, getExceptionMessage(e));
        throw new ConfigException(message, e);
      }

@@ -195,7 +195,7 @@

        // This should never happen.
        LocalizableMessage message = ERR_TASKBE_CANNOT_DECODE_SCHEDULED_TASK_BASE_DN.get(
            String.valueOf(scheduledTaskBaseString), getExceptionMessage(e));
            scheduledTaskBaseString, getExceptionMessage(e));
        throw new ConfigException(message, e);
      }
    }
@@ -517,8 +517,7 @@
    if (parentDN == null)
    {
      LocalizableMessage message = ERR_TASKBE_ADD_DISALLOWED_DN.
          get(String.valueOf(scheduledTaskParentDN),
              String.valueOf(recurringTaskParentDN));
          get(scheduledTaskParentDN, recurringTaskParentDN);
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    }

@@ -542,8 +541,7 @@

    // We won't allow the entry to be added.
    LocalizableMessage message = ERR_TASKBE_ADD_DISALLOWED_DN.
        get(String.valueOf(scheduledTaskParentDN),
            String.valueOf(recurringTaskParentDN));
        get(scheduledTaskParentDN, recurringTaskParentDN);
    throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
  }

@@ -561,8 +559,7 @@
    DN parentDN = entryDN.getParentDNInSuffix();
    if (parentDN == null)
    {
      LocalizableMessage message =
          ERR_TASKBE_DELETE_INVALID_ENTRY.get(String.valueOf(entryDN));
      LocalizableMessage message = ERR_TASKBE_DELETE_INVALID_ENTRY.get(entryDN);
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    }
    else if (parentDN.equals(scheduledTaskParentDN))
@@ -571,8 +568,7 @@
      Task t = taskScheduler.getScheduledTask(entryDN);
      if (t == null)
      {
        LocalizableMessage message =
            ERR_TASKBE_DELETE_NO_SUCH_TASK.get(String.valueOf(entryDN));
        LocalizableMessage message = ERR_TASKBE_DELETE_NO_SUCH_TASK.get(entryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }

@@ -603,8 +599,7 @@
      }
      else
      {
        LocalizableMessage message =
            ERR_TASKBE_DELETE_RUNNING.get(String.valueOf(entryDN));
        LocalizableMessage message = ERR_TASKBE_DELETE_RUNNING.get(entryDN);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }
    }
@@ -614,8 +609,7 @@
      RecurringTask rt = taskScheduler.getRecurringTask(entryDN);
      if (rt == null)
      {
        LocalizableMessage message = ERR_TASKBE_DELETE_NO_SUCH_RECURRING_TASK.get(
            String.valueOf(entryDN));
        LocalizableMessage message = ERR_TASKBE_DELETE_NO_SUCH_RECURRING_TASK.get(entryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }

@@ -623,8 +617,7 @@
    }
    else
    {
      LocalizableMessage message =
          ERR_TASKBE_DELETE_INVALID_ENTRY.get(String.valueOf(entryDN));
      LocalizableMessage message = ERR_TASKBE_DELETE_INVALID_ENTRY.get(entryDN);
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    }
  }
@@ -647,8 +640,7 @@
      if (entryLock == null)
      {
        throw new DirectoryException(ResultCode.BUSY,
                                     ERR_TASKBE_MODIFY_CANNOT_LOCK_ENTRY.get(
                                          String.valueOf(entryDN)));
                                     ERR_TASKBE_MODIFY_CANNOT_LOCK_ENTRY.get(entryDN));
      }
    }

@@ -659,8 +651,7 @@
      DN parentDN = entryDN.getParentDNInSuffix();
      if (parentDN == null)
      {
        LocalizableMessage message =
            ERR_TASKBE_MODIFY_INVALID_ENTRY.get(String.valueOf(entryDN));
        LocalizableMessage message = ERR_TASKBE_MODIFY_INVALID_ENTRY.get(entryDN);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }
      else if (parentDN.equals(scheduledTaskParentDN))
@@ -669,8 +660,7 @@
        Task t = taskScheduler.getScheduledTask(entryDN);
        if (t == null)
        {
          LocalizableMessage message =
              ERR_TASKBE_MODIFY_NO_SUCH_TASK.get(String.valueOf(entryDN));
          LocalizableMessage message = ERR_TASKBE_MODIFY_NO_SUCH_TASK.get(entryDN);
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
        }

@@ -703,17 +693,14 @@
          }
          else
          {
            LocalizableMessage message =
                 ERR_TASKBE_MODIFY_RUNNING.get(String.valueOf(entryDN));
            throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
                                         message);
            LocalizableMessage message = ERR_TASKBE_MODIFY_RUNNING.get(entryDN);
            throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
          }
        }
        else if (TaskState.isPending(state) && t.isRecurring())
        {
          // Pending recurring task iterations can only be canceled.
          boolean acceptable = isReplaceEntryAcceptable(modifyOperation);

          if (acceptable)
          {
            Task newTask = taskScheduler.entryToScheduledTask(newEntry,
@@ -742,31 +729,25 @@
          }
          else
          {
            LocalizableMessage message =
              ERR_TASKBE_MODIFY_RECURRING.get(String.valueOf(entryDN));
            throw new DirectoryException(
              ResultCode.UNWILLING_TO_PERFORM, message);
            LocalizableMessage message = ERR_TASKBE_MODIFY_RECURRING.get(entryDN);
            throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
          }
        }
        else
        {
          LocalizableMessage message =
              ERR_TASKBE_MODIFY_COMPLETED.get(String.valueOf(entryDN));
          throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
                                       message);
          LocalizableMessage message = ERR_TASKBE_MODIFY_COMPLETED.get(entryDN);
          throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
        }
      }
      else if (parentDN.equals(recurringTaskParentDN))
      {
        // We don't currently support altering recurring tasks.
        LocalizableMessage message =
            ERR_TASKBE_MODIFY_RECURRING.get(String.valueOf(entryDN));
        LocalizableMessage message = ERR_TASKBE_MODIFY_RECURRING.get(entryDN);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }
      else
      {
        LocalizableMessage message =
            ERR_TASKBE_MODIFY_INVALID_ENTRY.get(String.valueOf(entryDN));
        LocalizableMessage message = ERR_TASKBE_MODIFY_INVALID_ENTRY.get(entryDN);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }
    }
@@ -934,8 +915,7 @@
      DN parentDN = baseDN.getParentDNInSuffix();
      if (parentDN == null)
      {
        LocalizableMessage message =
            ERR_TASKBE_SEARCH_INVALID_BASE.get(String.valueOf(baseDN));
        LocalizableMessage message = ERR_TASKBE_SEARCH_INVALID_BASE.get(baseDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }
      else if (parentDN.equals(scheduledTaskParentDN))
@@ -947,8 +927,7 @@
          Entry e = taskScheduler.getScheduledTaskEntry(baseDN);
          if (e == null)
          {
            LocalizableMessage message =
                ERR_TASKBE_SEARCH_NO_SUCH_TASK.get(String.valueOf(baseDN));
            LocalizableMessage message = ERR_TASKBE_SEARCH_NO_SUCH_TASK.get(baseDN);
            throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
                                         scheduledTaskParentDN, null);
          }
@@ -976,8 +955,7 @@
          Entry e = taskScheduler.getRecurringTaskEntry(baseDN);
          if (e == null)
          {
            LocalizableMessage message = ERR_TASKBE_SEARCH_NO_SUCH_RECURRING_TASK.get(
                String.valueOf(baseDN));
            LocalizableMessage message = ERR_TASKBE_SEARCH_NO_SUCH_RECURRING_TASK.get(baseDN);
            throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
                                         recurringTaskParentDN, null);
          }
@@ -998,8 +976,7 @@
      }
      else
      {
        LocalizableMessage message =
            ERR_TASKBE_SEARCH_INVALID_BASE.get(String.valueOf(baseDN));
        LocalizableMessage message = ERR_TASKBE_SEARCH_INVALID_BASE.get(baseDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }
    }
@@ -1115,10 +1092,8 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message =
          ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
      LocalizableMessage message = ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
    }

    // Write to.
@@ -1155,11 +1130,8 @@
        {
          if (! le.canContinueReading())
          {
            LocalizableMessage message =
                ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(String.valueOf(e));
            throw new DirectoryException(
                           DirectoryServer.getServerErrorResultCode(),
                           message, le);
            LocalizableMessage message = ERR_TASKS_CANNOT_EXPORT_TO_FILE.get(e);
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, le);
          }
          else
          {
@@ -1362,10 +1334,8 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_TASKS_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
          get(String.valueOf(filename), backupDirectory.getPath(),
              getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
          get(filename, backupDirectory.getPath(), getExceptionMessage(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
    }


@@ -2053,16 +2023,12 @@
            }
            else if (! p.exists())
            {

              messages.add(ERR_TASKBE_BACKING_FILE_MISSING_PARENT.get(
                      String.valueOf(p), tmpBackingFile));
              messages.add(ERR_TASKBE_BACKING_FILE_MISSING_PARENT.get(p, tmpBackingFile));
              resultCode = ResultCode.CONSTRAINT_VIOLATION;
            }
            else if (! p.isDirectory())
            {

              messages.add(ERR_TASKBE_BACKING_FILE_PARENT_NOT_DIRECTORY.get(
                      String.valueOf(p), tmpBackingFile));
              messages.add(ERR_TASKBE_BACKING_FILE_PARENT_NOT_DIRECTORY.get(p, tmpBackingFile));
              resultCode = ResultCode.CONSTRAINT_VIOLATION;
            }
          }

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

@@ -218,7 +218,7 @@
      if (recurringTasks.containsKey(id))
      {
        LocalizableMessage message =
            ERR_TASKSCHED_DUPLICATE_RECURRING_ID.get(String.valueOf(id));
            ERR_TASKSCHED_DUPLICATE_RECURRING_ID.get(id);
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
      }

@@ -341,8 +341,7 @@

      if (tasks.containsKey(id))
      {
        LocalizableMessage message =
            ERR_TASKSCHED_DUPLICATE_TASK_ID.get(String.valueOf(id));
        LocalizableMessage message = ERR_TASKSCHED_DUPLICATE_TASK_ID.get(id);
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
      }

@@ -351,8 +350,7 @@
        Task t = tasks.get(dependencyID);
        if (t == null)
        {
          LocalizableMessage message = ERR_TASKSCHED_DEPENDENCY_MISSING.get(
            String.valueOf(id), dependencyID);
          LocalizableMessage message = ERR_TASKSCHED_DEPENDENCY_MISSING.get(id, dependencyID);
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
        }
      }
@@ -472,8 +470,7 @@
      Task t = tasks.get(taskID);
      if (t == null)
      {
        LocalizableMessage message = ERR_TASKSCHED_REMOVE_PENDING_NO_SUCH_TASK.get(
            String.valueOf(taskID));
        LocalizableMessage message = ERR_TASKSCHED_REMOVE_PENDING_NO_SUCH_TASK.get(taskID);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }

@@ -486,8 +483,7 @@
      }
      else
      {
        LocalizableMessage message = ERR_TASKSCHED_REMOVE_PENDING_NOT_PENDING.get(
            String.valueOf(taskID));
        LocalizableMessage message = ERR_TASKSCHED_REMOVE_PENDING_NOT_PENDING.get(taskID);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }
    }
@@ -528,8 +524,7 @@
        }
      }

      LocalizableMessage message = ERR_TASKSCHED_REMOVE_COMPLETED_NO_SUCH_TASK.get(
          String.valueOf(taskID));
      LocalizableMessage message = ERR_TASKSCHED_REMOVE_COMPLETED_NO_SUCH_TASK.get(taskID);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
    }
    finally
@@ -1169,7 +1164,7 @@
      logger.traceException(ioe);

      LocalizableMessage message = ERR_TASKSCHED_ERROR_READING_TASK_BACKING_FILE.get(
          String.valueOf(backingFilePath), stackTraceToSingleLineString(ioe));
          backingFilePath, stackTraceToSingleLineString(ioe));
      throw new InitializationException(message, ioe);
    }
  }
@@ -1310,14 +1305,11 @@
      {
        logger.traceException(e);

        LocalizableMessage message =
            WARN_TASKSCHED_CANNOT_RENAME_CURRENT_BACKING_FILE.get(String
                .valueOf(backingFilePath), String.valueOf(saveFile
                .getAbsolutePath()), stackTraceToSingleLineString(e));
        LocalizableMessage message = WARN_TASKSCHED_CANNOT_RENAME_CURRENT_BACKING_FILE.get(
            backingFilePath, saveFile.getAbsolutePath(), stackTraceToSingleLineString(e));
        logger.warn(message);
        DirectoryServer.sendAlertNotification(this,
                             ALERT_TYPE_CANNOT_RENAME_CURRENT_TASK_FILE,
                message);
        DirectoryServer.sendAlertNotification(
            this, ALERT_TYPE_CANNOT_RENAME_CURRENT_TASK_FILE, message);
      }


@@ -1331,14 +1323,11 @@
      {
        logger.traceException(e);

        LocalizableMessage message =
            ERR_TASKSCHED_CANNOT_RENAME_NEW_BACKING_FILE.get(String
                .valueOf(tmpFilePath), String.valueOf(backingFilePath),
                stackTraceToSingleLineString(e));
        LocalizableMessage message = ERR_TASKSCHED_CANNOT_RENAME_NEW_BACKING_FILE.get(
            tmpFilePath, backingFilePath, stackTraceToSingleLineString(e));
        logger.error(message);
        DirectoryServer.sendAlertNotification(this,
                             ALERT_TYPE_CANNOT_RENAME_NEW_TASK_FILE,
                message);
        DirectoryServer.sendAlertNotification(
            this, ALERT_TYPE_CANNOT_RENAME_NEW_TASK_FILE, message);
      }
    }
    catch (IOException ioe)
@@ -1602,7 +1591,7 @@
    if (lock == null)
    {
      throw new DirectoryException(ResultCode.BUSY,
          ERR_BACKEND_CANNOT_LOCK_ENTRY.get(String.valueOf(entryDN)));
          ERR_BACKEND_CANNOT_LOCK_ENTRY.get(entryDN));
    }
    else
    {
@@ -1933,10 +1922,8 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_TASKSCHED_CANNOT_LOAD_CLASS.
          get(String.valueOf(taskClassName), ATTR_TASK_CLASS,
              stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
          get(taskClassName, ATTR_TASK_CLASS, stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
    }

    // Instantiate the class as a task.
@@ -1950,9 +1937,8 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_TASKSCHED_CANNOT_INSTANTIATE_CLASS_AS_TASK.get(
          String.valueOf(taskClassName), Task.class.getName());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
          taskClassName, Task.class.getName());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
    }

    // Perform the necessary internal and external initialization for the task.
@@ -1965,16 +1951,14 @@
      logger.traceException(ie);

      LocalizableMessage message = ERR_TASKSCHED_CANNOT_INITIALIZE_INTERNAL.get(
          String.valueOf(taskClassName), ie.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
          taskClassName, ie.getMessage());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_TASKSCHED_CANNOT_INITIALIZE_INTERNAL.get(
          String.valueOf(taskClassName), stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
          taskClassName, stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
    }

    if (!TaskState.isDone(task.getTaskState()) &&

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

@@ -727,10 +727,8 @@
    }
    else
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(
          getName(), value.getClass().getName() + ":" +
                                       String.valueOf(value));
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(
          getName(), value.getClass().getName() + ":" + value));
    }
  }


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

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

        LocalizableMessage message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_CHILD.
            get(String.valueOf(childDN), String.valueOf(entry.getName()),
                stackTraceToSingleLineString(e));
            get(childDN, entry.getName(), stackTraceToSingleLineString(e));
        throw new ConfigException(message, e);
      }
    }

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

@@ -445,8 +445,7 @@
      if (valueSet.contains(attrValue))
      {
        LocalizableMessage message =
            ERR_CONFIG_ATTR_ADD_VALUES_ALREADY_EXISTS.get(
                    getName(), String.valueOf(value));
            ERR_CONFIG_ATTR_ADD_VALUES_ALREADY_EXISTS.get(getName(), value);
        throw new ConfigException(message);
      }

@@ -660,10 +659,7 @@
      {
        logger.traceException(e);

        LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
                valueString, getName(),
                String.valueOf(e));

        LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(valueString, getName(), e);
        if (allowFailures)
        {
          logger.error(message);
@@ -1186,8 +1182,7 @@
      {
        logger.traceException(e);

        LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
            (String) value, getName(), String.valueOf(e));
        LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(value, getName(), e);
        throw new ConfigException(message, e);
      }

@@ -1198,7 +1193,6 @@
      String componentType = value.getClass().getComponentType().getName();
      int length = Array.getLength(value);


      if (componentType.equals(DN.class.getName()))
      {
        ArrayList<DN> dnList = new ArrayList<DN>(length);
@@ -1227,8 +1221,7 @@
            {
              logger.traceException(e);

              LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
                  valueStr, getName(), String.valueOf(e));
              LocalizableMessage message = ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(valueStr, getName(), e);
              throw new ConfigException(message, e);
            }

@@ -1248,24 +1241,21 @@
          logger.traceException(e);

          LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_DN_VALUE.get(
              getName(), String.valueOf(value), String.valueOf(e));
              getName(), value, e);
          throw new ConfigException(message, e);
        }
      }
      else
      {
        LocalizableMessage message =
            ERR_CONFIG_ATTR_DN_INVALID_ARRAY_TYPE.get(
                    String.valueOf(jmxAttribute),
                    String.valueOf(componentType));
            ERR_CONFIG_ATTR_DN_INVALID_ARRAY_TYPE.get(jmxAttribute, componentType);
        throw new ConfigException(message);
      }
    }
    else
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_DN_INVALID_TYPE.get(
          String.valueOf(value), getName(), value.getClass().getName());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ATTR_DN_INVALID_TYPE.get(
          value, getName(), value.getClass().getName()));
    }
  }


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

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

      rejectReason.append(ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(
              getName(), stringValue, String.valueOf(e)));
              getName(), stringValue, e));
      return false;
    }

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

        LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
                valueString, getName(),
                String.valueOf(e));

                valueString, getName(), e);
        if (allowFailures)
        {
          logger.error(message);
@@ -1480,8 +1478,7 @@
      {
        logger.traceException(e);

        LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
            String.valueOf(value), getName(), String.valueOf(e));
        LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(value, getName(), e);
        throw new ConfigException(message, e);
      }
    }
@@ -1545,15 +1542,14 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
            componentType + "[" + length + "]", getName(), String.valueOf(e));
            componentType + "[" + length + "]", getName(), e);
        throw new ConfigException(message, e);
      }
    }
    else
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_INT_INVALID_TYPE.get(
          String.valueOf(value), getName(), value.getClass().getName());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ATTR_INT_INVALID_TYPE.get(
          value, getName(), value.getClass().getName()));
    }
  }


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

@@ -556,9 +556,7 @@
    int spacePos = value.indexOf(' ');
    if (spacePos <= 0)
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_NO_UNIT_DELIMITER.get(
          String.valueOf(value), getName());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ATTR_NO_UNIT_DELIMITER.get(value, getName()));
    }


@@ -571,8 +569,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_ATTR_COULD_NOT_PARSE_INT_COMPONENT.get(
          String.valueOf(value), getName(), String.valueOf(e));
      LocalizableMessage message = ERR_CONFIG_ATTR_COULD_NOT_PARSE_INT_COMPONENT.get(value, getName(), e);
      throw new ConfigException(message, e);
    }

@@ -689,8 +686,7 @@
    {
      logger.traceException(e);

      rejectReason.append(ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
              lowerValue, getName(), String.valueOf(e)));
      rejectReason.append(ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(lowerValue, getName(), e));
      return false;
    }

@@ -701,8 +697,7 @@
    double multiplier;
    if (! units.containsKey(unit))
    {
      rejectReason.append(ERR_CONFIG_ATTR_INVALID_UNIT.get(unit,
                                     getName()));
      rejectReason.append(ERR_CONFIG_ATTR_INVALID_UNIT.get(unit, getName()));
      return false;
    }
    else
@@ -959,9 +954,8 @@
            }
            catch (Exception e)
            {
              LocalizableMessage message = ERR_CONFIG_ATTR_COULD_NOT_PARSE_INT_COMPONENT.
                  get(valueString, a.getName(), String.valueOf(e));
              throw new ConfigException(message);
              throw new ConfigException(ERR_CONFIG_ATTR_COULD_NOT_PARSE_INT_COMPONENT.
                  get(valueString, a.getName(), e));
            }


@@ -1044,9 +1038,8 @@
          }
          catch (Exception e)
          {
            LocalizableMessage message = ERR_CONFIG_ATTR_COULD_NOT_PARSE_INT_COMPONENT.get(
                valueString, a.getName(), String.valueOf(e));
            throw new ConfigException(message);
            throw new ConfigException(ERR_CONFIG_ATTR_COULD_NOT_PARSE_INT_COMPONENT.get(
                valueString, a.getName(), e));
          }


@@ -1232,9 +1225,8 @@
    }
    else
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_INT_WITH_UNIT_INVALID_TYPE.get(
          String.valueOf(value), getName(), value.getClass().getName());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ATTR_INT_WITH_UNIT_INVALID_TYPE.get(
          value, getName(), value.getClass().getName()));
    }
  }


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

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

      LocalizableMessage message = ERR_CONFIG_JMX_CANNOT_GET_ATTRIBUTE.
          get(String.valueOf(attributeName), String.valueOf(configEntryDN),
              getExceptionMessage(e));
          get(attributeName, configEntryDN, getExceptionMessage(e));
      throw new AttributeNotFoundException(message.toString());
    }

@@ -506,8 +505,7 @@
       clientConnection = null ;

       LocalizableMessage message = ERR_CONFIG_JMX_CANNOT_GET_ATTRIBUTE.
         get(String.valueOf(attributeName), String.valueOf(configEntryDN),
             String.valueOf(op.getErrorMessage()));
         get(attributeName, configEntryDN, op.getErrorMessage());
       throw new AttributeNotFoundException(message.toString());
    }

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

      LocalizableMessage message = ERR_CONFIG_JMX_ATTR_NO_ATTR.get(String.valueOf(configEntryDN), attributeName);
      LocalizableMessage message = ERR_CONFIG_JMX_ATTR_NO_ATTR.get(configEntryDN, attributeName);
      logger.error(message);
      throw new AttributeNotFoundException(message.toString());
    }

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

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

          LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_STRING_VALUE.get(
              getName(), String.valueOf(value), String.valueOf(e));
          throw new ConfigException(message, e);
          throw new ConfigException(ERR_CONFIG_ATTR_INVALID_STRING_VALUE.get(getName(), value, e), e);
        }
      }
      else
@@ -1228,9 +1226,7 @@
    }
    else
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_STRING_INVALID_TYPE.get(
          String.valueOf(value), getName(), value.getClass().getName());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ATTR_STRING_INVALID_TYPE.get(value, getName(), value.getClass().getName()));
    }
  }


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

@@ -1108,25 +1108,20 @@
        {
          logger.traceException(e);

          LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_STRING_VALUE.get(
              getName(), String.valueOf(value), String.valueOf(e));
          throw new ConfigException(message, e);
          throw new ConfigException(ERR_CONFIG_ATTR_INVALID_STRING_VALUE.get(getName(), value, e), e);
        }
      }
      else
      {
        LocalizableMessage message =
            ERR_CONFIG_ATTR_STRING_INVALID_ARRAY_TYPE.get(
                    String.valueOf(jmxAttribute),
                    String.valueOf(componentType));
            ERR_CONFIG_ATTR_STRING_INVALID_ARRAY_TYPE.get(jmxAttribute, componentType);
        throw new ConfigException(message);
      }
    }
    else
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_STRING_INVALID_TYPE.get(
          String.valueOf(value), getName(), value.getClass().getName());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ATTR_STRING_INVALID_TYPE.get(
          value, getName(), value.getClass().getName()));
    }
  }


 opendj3-server-dev/src/server/org/opends/server/controls/EntryChangeNotificationControl.java

@@ -87,10 +87,8 @@
        {
          if (changeType != PersistentSearchChangeType.MODIFY_DN)
          {
            LocalizableMessage message =
                ERR_ECN_ILLEGAL_PREVIOUS_DN.get(String.valueOf(changeType));
            throw new DirectoryException(
                ResultCode.PROTOCOL_ERROR, message);
            LocalizableMessage message = ERR_ECN_ILLEGAL_PREVIOUS_DN.get(changeType);
            throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
          }

          previousDN = DN.valueOf(reader.readOctetStringAsString());

 opendj3-server-dev/src/server/org/opends/server/controls/MatchedValuesFilter.java

@@ -568,7 +568,7 @@
      case NOT:
        // These filter types cannot be used in a matched values filter.
        LocalizableMessage message = ERR_MVFILTER_INVALID_LDAP_FILTER_TYPE.get(
            String.valueOf(filter), String.valueOf(filter.getFilterType()));
            filter, filter.getFilterType());
        throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);


@@ -617,8 +617,7 @@
        if (filter.getDNAttributes())
        {
          // This cannot be represented in a matched values filter.
          message = ERR_MVFILTER_INVALID_DN_ATTRIBUTES_FLAG.get(
              String.valueOf(filter));
          message = ERR_MVFILTER_INVALID_DN_ATTRIBUTES_FLAG.get(filter);
          throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
        }
        else
@@ -631,8 +630,7 @@


      default:
        message = ERR_MVFILTER_INVALID_LDAP_FILTER_TYPE.get(
            String.valueOf(filter), String.valueOf(filter.getFilterType()));
        message = ERR_MVFILTER_INVALID_LDAP_FILTER_TYPE.get(filter, filter.getFilterType());
        throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
    }
  }

 opendj3-server-dev/src/server/org/opends/server/controls/PagedResultsControl.java

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

        LocalizableMessage message =
            ERR_LDAP_PAGED_RESULTS_DECODE_SEQUENCE.get(String.valueOf(e));
        LocalizableMessage message = ERR_LDAP_PAGED_RESULTS_DECODE_SEQUENCE.get(e);
        throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message, e);
      }

@@ -96,8 +95,7 @@
      {
        logger.traceException(e);

        LocalizableMessage message =
            ERR_LDAP_PAGED_RESULTS_DECODE_SIZE.get(String.valueOf(e));
        LocalizableMessage message = ERR_LDAP_PAGED_RESULTS_DECODE_SIZE.get(e);
        throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message, e);
      }

@@ -110,8 +108,7 @@
      {
        logger.traceException(e);

        LocalizableMessage message =
            ERR_LDAP_PAGED_RESULTS_DECODE_COOKIE.get(String.valueOf(e));
        LocalizableMessage message = ERR_LDAP_PAGED_RESULTS_DECODE_COOKIE.get(e);
        throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message, e);
      }

@@ -123,8 +120,7 @@
      {
        logger.traceException(e);

        LocalizableMessage message =
            ERR_LDAP_PAGED_RESULTS_DECODE_SEQUENCE.get(String.valueOf(e));
        LocalizableMessage message = ERR_LDAP_PAGED_RESULTS_DECODE_SEQUENCE.get(e);
        throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message, e);
      }


 opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV1Control.java

@@ -289,7 +289,7 @@
    if (entryLock == null)
    {
      throw new DirectoryException(ResultCode.BUSY,
          ERR_PROXYAUTH1_CANNOT_LOCK_USER.get(String.valueOf(authzDN)));
          ERR_PROXYAUTH1_CANNOT_LOCK_USER.get(authzDN));
    }

    try
@@ -298,8 +298,7 @@
      if (userEntry == null)
      {
        // The requested user does not exist.
        LocalizableMessage message =
            ERR_PROXYAUTH1_NO_SUCH_USER.get(String.valueOf(authzDN));
        LocalizableMessage message = ERR_PROXYAUTH1_NO_SUCH_USER.get(authzDN);
        throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
      }

@@ -311,8 +310,7 @@

      if (state.isDisabled())
      {
        LocalizableMessage message = ERR_PROXYAUTH1_UNUSABLE_ACCOUNT.get(String
            .valueOf(userEntry.getName()));
        LocalizableMessage message = ERR_PROXYAUTH1_UNUSABLE_ACCOUNT.get(userEntry.getName());
        throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
      }

@@ -325,10 +323,8 @@
            pwpState.lockedDueToMaximumResetAge() ||
            pwpState.isPasswordExpired())
        {
          LocalizableMessage message = ERR_PROXYAUTH1_UNUSABLE_ACCOUNT.get(String
              .valueOf(authzDN));
          throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED,
              message);
          LocalizableMessage message = ERR_PROXYAUTH1_UNUSABLE_ACCOUNT.get(authzDN);
          throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
        }
      }


 opendj3-server-dev/src/server/org/opends/server/controls/ProxiedAuthV2Control.java

@@ -241,7 +241,7 @@
        if (entryLock == null)
        {
          throw new DirectoryException(ResultCode.BUSY,
              ERR_PROXYAUTH2_CANNOT_LOCK_USER.get(String.valueOf(authzDN)));
              ERR_PROXYAUTH2_CANNOT_LOCK_USER.get(authzDN));
        }

        try
@@ -319,8 +319,7 @@

    if (state.isDisabled())
    {
      LocalizableMessage message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(String
          .valueOf(userEntry.getName()));
      LocalizableMessage message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(userEntry.getName());
      throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
    }

@@ -333,10 +332,8 @@
          pwpState.lockedDueToMaximumResetAge() ||
          pwpState.isPasswordExpired())
      {
        LocalizableMessage message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(String
            .valueOf(userEntry.getName()));
        throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED,
            message);
        LocalizableMessage message = ERR_PROXYAUTH2_UNUSABLE_ACCOUNT.get(userEntry.getName());
        throw new DirectoryException(ResultCode.AUTHORIZATION_DENIED, message);
      }
    }
  }

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

@@ -253,9 +253,7 @@
    DN configEntryDN = configuration.dn();
    if (notificationHandlers.containsKey(configEntryDN))
    {
      LocalizableMessage message = ERR_CONFIG_ACCTNOTHANDLER_EXISTS.get(
              String.valueOf(configEntryDN));
      unacceptableReasons.add (message);
      unacceptableReasons.add(ERR_CONFIG_ACCTNOTHANDLER_EXISTS.get(configEntryDN));
      status = false;
    }
    // If configuration is enabled then check that notification class

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

@@ -373,9 +373,7 @@
              && !isSynchronizationOperation())
          {
            throw new LDAPException(LDAPResultCode.UNWILLING_TO_PERFORM,
                ERR_ADD_ATTR_IS_NO_USER_MOD.get(
                    String.valueOf(entryDN),
                    attr.getName()));
                ERR_ADD_ATTR_IS_NO_USER_MOD.get(entryDN, attr.getName()));
          }

          if(attrType.isBinary())
@@ -394,9 +392,7 @@
            if(attr.hasOption("binary"))
            {
              throw new LDAPException(LDAPResultCode.UNDEFINED_ATTRIBUTE_TYPE,
                      ERR_ADD_ATTR_IS_INVALID_OPTION.get(
                      String.valueOf(entryDN),
                      attr.getName()));
                  ERR_ADD_ATTR_IS_INVALID_OPTION.get(entryDN, attr.getName()));
            }
          }

@@ -794,14 +790,12 @@
      // The entry doesn't have a parent but isn't a suffix.  This is not
      // allowed.
      setResultCode(ResultCode.NO_SUCH_OBJECT);
      appendErrorMessage(ERR_ADD_ENTRY_NOT_SUFFIX.get(
        String.valueOf(entryDN)));
      appendErrorMessage(ERR_ADD_ENTRY_NOT_SUFFIX.get(entryDN));
      return;
    }
    // The suffix does not exist
    setResultCode(ResultCode.NO_SUCH_OBJECT);
    appendErrorMessage(ERR_ADD_ENTRY_UNKNOWN_SUFFIX.get(
      String.valueOf(entryDN)));
    appendErrorMessage(ERR_ADD_ENTRY_UNKNOWN_SUFFIX.get(entryDN));
  }



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

@@ -424,8 +424,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_ALERTHANDLER_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -219,9 +219,8 @@
      }
      catch (DirectoryException de)
      {
        LocalizableMessage message = WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX.get(
                String.valueOf(configuration.dn()), de.getMessageObject());
        messages.add(message);
        messages.add(WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX.get(
                configuration.dn(), de.getMessageObject()));

        if (resultCode == ResultCode.SUCCESS)
        {
@@ -412,10 +411,8 @@
      }
      catch (DirectoryException de)
      {
        LocalizableMessage message = WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX.get(
                String.valueOf(configuration.dn()),
                de.getMessageObject());
        messages.add(message);
        messages.add(WARN_CONFIG_SCHEMA_SYNTAX_CONFLICTING_SYNTAX.get(
                configuration.dn(), de.getMessageObject()));

        if (resultCode == ResultCode.SUCCESS)
        {

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

@@ -227,7 +227,7 @@
      for (ClientConnection conn : connectionSet)
      {
        LocalizableMessage message = WARN_CLIENTCONNECTION_DISCONNECT_DUE_TO_DELETE.get(
                String.valueOf(entry.getName()));
                entry.getName());

        conn.disconnect(DisconnectReason.INVALID_CREDENTIALS, true, message);
      }

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

@@ -408,8 +408,7 @@
      if (! Backend.class.isAssignableFrom(backendClass))
      {

        unacceptableReason.add(ERR_CONFIG_BACKEND_CLASS_NOT_BACKEND.get(
                String.valueOf(className), String.valueOf(backendDN)));
        unacceptableReason.add(ERR_CONFIG_BACKEND_CLASS_NOT_BACKEND.get(className, backendDN));
        return false;
      }

@@ -422,12 +421,8 @@
    catch (Exception e)
    {
      logger.traceException(e);


      unacceptableReason.add(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
              String.valueOf(className),
              String.valueOf(backendDN),
              stackTraceToSingleLineString(e)));
      unacceptableReason.add(
          ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(className, backendDN, stackTraceToSingleLineString(e)));
      return false;
    }

@@ -522,7 +517,7 @@


      messages.add(ERR_CONFIG_BACKEND_UNABLE_TO_DETERMINE_ENABLED_STATE.get(
              String.valueOf(backendDN), stackTraceToSingleLineString(e)));
              backendDN, stackTraceToSingleLineString(e)));
      resultCode = DirectoryServer.getServerErrorResultCode();
      return new ConfigChangeResult(resultCode, adminActionRequired, messages);
    }
@@ -583,36 +578,27 @@
            // change is successful, but indicate that some administrative
            // action is required.

            messages.add(
                    NOTE_CONFIG_BACKEND_ACTION_REQUIRED_TO_CHANGE_CLASS.get(
                            String.valueOf(backendDN),
                            backend.getClass().getName(), className));
            messages.add(NOTE_CONFIG_BACKEND_ACTION_REQUIRED_TO_CHANGE_CLASS.get(
                backendDN, backend.getClass().getName(), className));
            adminActionRequired = true;
            return new ConfigChangeResult(resultCode, adminActionRequired,
                                          messages);
            return new ConfigChangeResult(resultCode, adminActionRequired, messages);
          }
          else
          {
            // It is not a valid backend class.  This is an error.

            messages.add(ERR_CONFIG_BACKEND_CLASS_NOT_BACKEND.get(
                    String.valueOf(className), String.valueOf(backendDN)));
            messages.add(ERR_CONFIG_BACKEND_CLASS_NOT_BACKEND.get(className, backendDN));
            resultCode = ResultCode.CONSTRAINT_VIOLATION;
            return new ConfigChangeResult(resultCode, adminActionRequired,
                                          messages);
            return new ConfigChangeResult(resultCode, adminActionRequired, messages);
          }
        }
        catch (Exception e)
        {
          logger.traceException(e);


          messages.add(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
                  String.valueOf(className), String.valueOf(backendDN),
                  stackTraceToSingleLineString(e)));
                  className, backendDN, stackTraceToSingleLineString(e)));
          resultCode = DirectoryServer.getServerErrorResultCode();
          return new ConfigChangeResult(resultCode, adminActionRequired,
                                        messages);
          return new ConfigChangeResult(resultCode, adminActionRequired, messages);
        }
      }
    }
@@ -631,12 +617,9 @@
      catch (Exception e)
      {
        // It is not a valid backend class.  This is an error.

        messages.add(ERR_CONFIG_BACKEND_CLASS_NOT_BACKEND.get(
                String.valueOf(className), String.valueOf(backendDN)));
        messages.add(ERR_CONFIG_BACKEND_CLASS_NOT_BACKEND.get(className, backendDN));
        resultCode = ResultCode.CONSTRAINT_VIOLATION;
        return new ConfigChangeResult(resultCode, adminActionRequired,
                                      messages);
        return new ConfigChangeResult(resultCode, adminActionRequired, messages);
      }


@@ -653,16 +636,14 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
        {
          LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(backendID,
              String.valueOf(failureReason));
          LocalizableMessage message = ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(backendID,failureReason);
          logger.error(message);
          // FIXME -- Do we need to send an admin alert?

          resultCode = ResultCode.CONSTRAINT_VIOLATION;
          adminActionRequired = true;
          messages.add(message);
          return new ConfigChangeResult(resultCode, adminActionRequired,
                                        messages);
          return new ConfigChangeResult(resultCode, adminActionRequired, messages);
        }
      }
      catch (Exception e)
@@ -691,8 +672,7 @@
        logger.traceException(e);

        messages.add(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE.get(
                String.valueOf(className), String.valueOf(backendDN),
                stackTraceToSingleLineString(e)));
                className, backendDN, stackTraceToSingleLineString(e)));
        resultCode = DirectoryServer.getServerErrorResultCode();

        try
@@ -701,9 +681,7 @@
          StringBuilder failureReason = new StringBuilder();
          if (! LockFileManager.releaseLock(lockFile, failureReason))
          {
            LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(backendID,
                String.valueOf(failureReason));
            logger.warn(message);
            logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(backendID, failureReason));
            // FIXME -- Do we need to send an admin alert?
          }
        }
@@ -711,9 +689,8 @@
        {
          logger.traceException(e2);

          LocalizableMessage message = WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(backendID,
              stackTraceToSingleLineString(e2));
          logger.warn(message);
          logger.warn(WARN_CONFIG_BACKEND_CANNOT_RELEASE_SHARED_LOCK.get(backendID,
              stackTraceToSingleLineString(e2)));
          // FIXME -- Do we need to send an admin alert?
        }

@@ -786,8 +763,7 @@
    String backendID = configEntry.getBackendId();
    if (DirectoryServer.hasBackend(backendID))
    {
      unacceptableReason.add(WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID.get(
              String.valueOf(backendDN), backendID));
      unacceptableReason.add(WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID.get(backendDN, backendID));
      return false;
    }

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

      unacceptableReason.add(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
              String.valueOf(className),
              String.valueOf(backendDN),
              stackTraceToSingleLineString(e)));
              className, backendDN, stackTraceToSingleLineString(e)));
      return false;
    }

@@ -876,11 +850,10 @@
    {
      // The backend is explicitly disabled.  We will log a message to
      // indicate that it won't be enabled and return.
      LocalizableMessage message = INFO_CONFIG_BACKEND_DISABLED.get(String.valueOf(backendDN));
      LocalizableMessage message = INFO_CONFIG_BACKEND_DISABLED.get(backendDN);
      logger.debug(message);
      messages.add(message);
      return new ConfigChangeResult(resultCode, adminActionRequired,
                                    messages);
      return new ConfigChangeResult(resultCode, adminActionRequired, messages);
    }


@@ -890,12 +863,10 @@
    String backendID = cfg.getBackendId();
    if (DirectoryServer.hasBackend(backendID))
    {
      LocalizableMessage message = WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID.get(String.valueOf(backendDN),
          backendID);
      LocalizableMessage message = WARN_CONFIG_BACKEND_DUPLICATE_BACKEND_ID.get(backendDN, backendID);
      logger.warn(message);
      messages.add(message);
      return new ConfigChangeResult(resultCode, adminActionRequired,
                                    messages);
      return new ConfigChangeResult(resultCode, adminActionRequired, messages);
    }


@@ -944,12 +915,9 @@
      logger.traceException(e);

      messages.add(ERR_CONFIG_BACKEND_CANNOT_INSTANTIATE.get(
              String.valueOf(className),
              String.valueOf(backendDN),
              stackTraceToSingleLineString(e)));
          className, backendDN, stackTraceToSingleLineString(e)));
      resultCode = DirectoryServer.getServerErrorResultCode();
      return new ConfigChangeResult(resultCode, adminActionRequired,
                                    messages);
      return new ConfigChangeResult(resultCode, adminActionRequired, messages);
    }


@@ -967,16 +935,14 @@
      if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
      {
        LocalizableMessage message =
            ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(backendID, String
                .valueOf(failureReason));
            ERR_CONFIG_BACKEND_CANNOT_ACQUIRE_SHARED_LOCK.get(backendID, failureReason);
        logger.error(message);
        // FIXME -- Do we need to send an admin alert?

        resultCode = ResultCode.CONSTRAINT_VIOLATION;
        adminActionRequired = true;
        messages.add(message);
        return new ConfigChangeResult(resultCode, adminActionRequired,
                                      messages);
        return new ConfigChangeResult(resultCode, adminActionRequired, messages);
      }
    }
    catch (Exception e)
@@ -1006,9 +972,7 @@
      logger.traceException(e);

      messages.add(ERR_CONFIG_BACKEND_CANNOT_INITIALIZE.get(
              String.valueOf(className),
              String.valueOf(backendDN),
              stackTraceToSingleLineString(e)));
              className, backendDN, stackTraceToSingleLineString(e)));
      resultCode = DirectoryServer.getServerErrorResultCode();

      try
@@ -1100,8 +1064,7 @@
    else
    {
      unacceptableReason.add(
              NOTE_CONFIG_BACKEND_CANNOT_REMOVE_BACKEND_WITH_SUBORDINATES.get(
                      String.valueOf(backendDN)));
              NOTE_CONFIG_BACKEND_CANNOT_REMOVE_BACKEND_WITH_SUBORDINATES.get(backendDN));
      return false;
    }
  }
@@ -1180,8 +1143,7 @@
    else
    {

      messages.add(NOTE_CONFIG_BACKEND_CANNOT_REMOVE_BACKEND_WITH_SUBORDINATES
              .get(String.valueOf(backendDN)));
      messages.add(NOTE_CONFIG_BACKEND_CANNOT_REMOVE_BACKEND_WITH_SUBORDINATES.get(backendDN));
      resultCode = ResultCode.UNWILLING_TO_PERFORM;
      return new ConfigChangeResult(resultCode, adminActionRequired, messages);
    }

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

@@ -83,8 +83,7 @@
    if (existingBackend != null)
    {
      LocalizableMessage message = ERR_REGISTER_BASEDN_ALREADY_EXISTS.
          get(String.valueOf(baseDN), backend.getBackendID(),
              existingBackend.getBackendID());
          get(baseDN, backend.getBackendID(), existingBackend.getBackendID());
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    }

@@ -103,10 +102,8 @@
        if (baseDN.isAncestorOf(dn) || baseDN.isDescendantOf(dn))
        {
          LocalizableMessage message = ERR_REGISTER_BASEDN_HIERARCHY_CONFLICT.
              get(String.valueOf(baseDN), backend.getBackendID(),
                  String.valueOf(dn));
          throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
                                       message);
              get(baseDN, backend.getBackendID(), dn);
          throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
        }
      }
    }
@@ -130,10 +127,8 @@
          if (! dn.isDescendantOf(superiorBaseDN))
          {
            LocalizableMessage message = ERR_REGISTER_BASEDN_DIFFERENT_PARENT_BASES.
                get(String.valueOf(baseDN), backend.getBackendID(),
                    String.valueOf(dn));
            throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
                                         message);
                get(baseDN, backend.getBackendID(), dn);
            throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
          }
        }

@@ -148,10 +143,8 @@
      if (backend.getParentBackend() != null)
      {
        LocalizableMessage message = ERR_REGISTER_BASEDN_NEW_BASE_NOT_SUBORDINATE.
            get(String.valueOf(baseDN), backend.getBackendID(),
                backend.getParentBackend().getBackendID());
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
                                     message);
            get(baseDN, backend.getBackendID(), backend.getParentBackend().getBackendID());
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }
    }

@@ -198,10 +191,8 @@
    {
      if (superiorBackend.entryExists(baseDN))
      {
        LocalizableMessage message = WARN_REGISTER_BASEDN_ENTRIES_IN_MULTIPLE_BACKENDS.
            get(superiorBackend.getBackendID(), String.valueOf(baseDN),
                backend.getBackendID());
        errors.add(message);
        errors.add(WARN_REGISTER_BASEDN_ENTRIES_IN_MULTIPLE_BACKENDS.
            get(superiorBackend.getBackendID(), baseDN, backend.getBackendID()));
      }
    }

@@ -283,7 +274,7 @@
    if (backend == null)
    {
      LocalizableMessage message =
          ERR_DEREGISTER_BASEDN_NOT_REGISTERED.get(String.valueOf(baseDN));
          ERR_DEREGISTER_BASEDN_NOT_REGISTERED.get(baseDN);
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    }

@@ -379,9 +370,8 @@
      {
        // Suppress this warning message on server shutdown.
        if (!DirectoryServer.getInstance().isShuttingDown()) {
          LocalizableMessage message = WARN_DEREGISTER_BASEDN_MISSING_HIERARCHY.get(
            String.valueOf(baseDN), backend.getBackendID());
          errors.add(message);
          errors.add(WARN_DEREGISTER_BASEDN_MISSING_HIERARCHY.get(
              baseDN, backend.getBackendID()));
        }

        if (!testOnly)

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

@@ -567,8 +567,7 @@
  private void updateOperationErrMsgAndResCode()
  {
    setResultCode(ResultCode.NO_SUCH_OBJECT);
    appendErrorMessage(
      ERR_COMPARE_NO_SUCH_ENTRY.get(String.valueOf(getEntryDN())));
    appendErrorMessage(ERR_COMPARE_NO_SUCH_ENTRY.get(getEntryDN()));
  }



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

@@ -128,19 +128,14 @@
        resultCode = DirectoryServer.getServerErrorResultCode();
      } catch (Exception e) {
        logger.traceException(e);


        messages.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
                String.valueOf(configuration.getJavaClass()),
                String.valueOf(dn),
            stackTraceToSingleLineString(e)));
            configuration.getJavaClass(), dn, stackTraceToSingleLineString(e)));
        resultCode = DirectoryServer.getServerErrorResultCode();
      }
    }

    // Return the configuration result.
    return new ConfigChangeResult(resultCode, adminActionRequired,
        messages);
    return new ConfigChangeResult(resultCode, adminActionRequired, messages);
  }


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

          messages.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
                  String.valueOf(configuration
              .getJavaClass()), String.valueOf(dn),
              stackTraceToSingleLineString(e)));
              configuration.getJavaClass(), dn, stackTraceToSingleLineString(e)));
          resultCode = DirectoryServer.getServerErrorResultCode();
        }
      }
@@ -402,9 +395,8 @@
    } catch (Exception e) {
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.
          get(String.valueOf(className), String.valueOf(config.dn()),
              stackTraceToSingleLineString(e));
      LocalizableMessage message = ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
          className, config.dn(), stackTraceToSingleLineString(e));
      throw new ConfigException(message, e);
    }

@@ -421,9 +413,8 @@
    } catch (Exception e) {
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.
          get(String.valueOf(className), String.valueOf(config.dn()),
              stackTraceToSingleLineString(e));
      LocalizableMessage message = ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
          className, config.dn(), stackTraceToSingleLineString(e));
      throw new ConfigException(message, e);
    }

@@ -459,9 +450,7 @@

      unacceptableReasons.add(
              ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
                      String.valueOf(className),
                      String.valueOf(config.dn()),
                      stackTraceToSingleLineString(e)));
                      className, config.dn(), stackTraceToSingleLineString(e)));
      return false;
    }

@@ -485,8 +474,7 @@
      logger.traceException(e);

      unacceptableReasons.add(ERR_CONFIG_CONNHANDLER_CANNOT_INITIALIZE.get(
              String.valueOf(className), String.valueOf(config.dn()),
              stackTraceToSingleLineString(e)));
          className, config.dn(), stackTraceToSingleLineString(e)));
      return false;
    }


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

@@ -415,8 +415,7 @@
  private void updateOperationErrMsgAndResCode()
  {
    setResultCode(ResultCode.NO_SUCH_OBJECT);
    appendErrorMessage(ERR_DELETE_NO_SUCH_ENTRY.get(
            String.valueOf(getEntryDN())));
    appendErrorMessage(ERR_DELETE_NO_SUCH_ENTRY.get(getEntryDN()));
  }



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

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

      LocalizableMessage message = ERR_CANNOT_CREATE_MBEAN_SERVER.get(String.valueOf(e));
      throw new InitializationException(message, e);
      throw new InitializationException(ERR_CANNOT_CREATE_MBEAN_SERVER.get(e), e);
    }
  }

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

      LocalizableMessage message =
          ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER.get(
                  String.valueOf(configClass),
                  e.getLocalizedMessage());
          ERR_CANNOT_INSTANTIATE_CONFIG_HANDLER.get(configClass, e.getLocalizedMessage());
      throw new InitializationException(message, e);
    }

@@ -1182,9 +1179,7 @@

      LocalizableMessage message =
          ERR_CANNOT_INITIALIZE_CONFIG_HANDLER.get(
                  String.valueOf(configClass),
                  String.valueOf(configFile),
                  e.getLocalizedMessage());
              configClass, configFile, e.getLocalizedMessage());
      throw new InitializationException(message, e);
    }
  }
@@ -1259,7 +1254,7 @@
          if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
          {
            LocalizableMessage message = ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK.get(
                lockFile, String.valueOf(failureReason));
                lockFile, failureReason);
            throw new InitializationException(message);
          }

@@ -1813,12 +1808,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_CANNOT_INITIALIZE_CONFIG_HANDLER.get(
                  String.valueOf(configClass),
                  String.valueOf(configFile),
                  e.getLocalizedMessage());
      throw new InitializationException(message);
      throw new InitializationException(ERR_CANNOT_INITIALIZE_CONFIG_HANDLER.get(
          configClass, configFile, e.getLocalizedMessage()));
    }


@@ -5658,8 +5649,7 @@
        && !existingRootEntryDN.equals(actualRootEntryDN))
    {
      LocalizableMessage message = ERR_CANNOT_REGISTER_DUPLICATE_ALTERNATE_ROOT_BIND_DN.
          get(String.valueOf(alternateRootBindDN),
              String.valueOf(existingRootEntryDN));
          get(alternateRootBindDN, existingRootEntryDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }
  }
@@ -9063,9 +9053,7 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
      {
        LocalizableMessage message = ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK.get(lockFile,
                                    String.valueOf(failureReason));
        System.err.println(message);
        System.err.println(ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK.get(lockFile, failureReason));
        System.exit(1);
      }
    }
@@ -9073,9 +9061,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK.get(lockFile,
                                  stackTraceToSingleLineString(e));
      System.err.println(message);
      System.err.println(ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK.get(
          lockFile, stackTraceToSingleLineString(e)));
      System.exit(1);
    }
    serverLocked = true;
@@ -9398,9 +9385,7 @@
      else
      {
        // The server's already running.
        LocalizableMessage message = ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK.get(lockFile,
            String.valueOf(failureReason));
        System.err.println(message);
        System.err.println(ERR_CANNOT_ACQUIRE_EXCLUSIVE_SERVER_LOCK.get(lockFile, failureReason));
        isServerRunning = true;
      }
    }

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

@@ -200,8 +200,7 @@
        if (cacheOrderMap.containsKey(configuration.getCacheLevel())) {
          // Log error and skip this cache.
          logger.error(ERR_CONFIG_ENTRYCACHE_CONFIG_LEVEL_NOT_ACCEPTABLE.get(
            String.valueOf(configuration.dn()),
            configuration.getCacheLevel()));
            configuration.dn(), configuration.getCacheLevel()));
          continue;
        }
      }
@@ -276,8 +275,7 @@
        (cacheOrderMap.containsKey(configuration.getCacheLevel()))) {
        unacceptableReasons.add(
          ERR_CONFIG_ENTRYCACHE_CONFIG_LEVEL_NOT_ACCEPTABLE.get(
            String.valueOf(configuration.dn()),
            configuration.getCacheLevel()));
            configuration.dn(), configuration.getCacheLevel()));
        status = false;
      }
    }
@@ -391,8 +389,7 @@
      if (cacheOrderMap.containsKey(configuration.getCacheLevel())) {
        unacceptableReasons.add(
          ERR_CONFIG_ENTRYCACHE_CONFIG_LEVEL_NOT_ACCEPTABLE.get(
            String.valueOf(configuration.dn()),
            configuration.getCacheLevel()));
            configuration.dn(), configuration.getCacheLevel()));
        status = false;
        return status;
      }
@@ -671,7 +668,7 @@
          throw (InitializationException) e;
        } else {
          LocalizableMessage message = ERR_CONFIG_ENTRYCACHE_CONFIG_NOT_ACCEPTABLE.get(
            String.valueOf(configuration.dn()), e.getCause() != null ?
            configuration.dn(), e.getCause() != null ?
              e.getCause().getMessage() : stackTraceToSingleLineString(e));
          throw new InitializationException(message);
        }

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

@@ -311,8 +311,7 @@
      if (handler == null)
      {
        setResultCode(ResultCode.UNWILLING_TO_PERFORM);
        appendErrorMessage(ERR_EXTENDED_NO_HANDLER.get(
                String.valueOf(requestOID)));
        appendErrorMessage(ERR_EXTENDED_NO_HANDLER.get(requestOID));
        return;
      }

@@ -363,11 +362,7 @@
          else if (! handler.supportsControl(c.getOID()))
          {
            setResultCode(ResultCode.UNAVAILABLE_CRITICAL_EXTENSION);

            appendErrorMessage(ERR_EXTENDED_UNSUPPORTED_CRITICAL_CONTROL.get(
                    String.valueOf(requestOID),
                    c.getOID()));

            appendErrorMessage(ERR_EXTENDED_UNSUPPORTED_CRITICAL_CONTROL.get(requestOID, c.getOID()));
            return;
          }
        }
@@ -386,8 +381,7 @@
            .getAccessControlHandler().isAllowed(this) == false)
        {
          setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS);
          appendErrorMessage(ERR_EXTENDED_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS
              .get(String.valueOf(requestOID)));
          appendErrorMessage(ERR_EXTENDED_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(requestOID));
          return;
        }
      }

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

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

          messages.add(ERR_CONFIG_EXTOP_INITIALIZATION_FAILED.get(
                  String.valueOf(configuration.getJavaClass()),
                  String.valueOf(dn),
                  stackTraceToSingleLineString(e)));
              configuration.getJavaClass(), dn, stackTraceToSingleLineString(e)));
          resultCode = DirectoryServer.getServerErrorResultCode();
        }
      }
@@ -293,9 +291,7 @@
        logger.traceException(e);

        messages.add(ERR_CONFIG_EXTOP_INITIALIZATION_FAILED.get(
                String.valueOf(configuration.getJavaClass()),
                String.valueOf(dn),
                stackTraceToSingleLineString(e)));
            configuration.getJavaClass(), dn, stackTraceToSingleLineString(e)));
        resultCode = DirectoryServer.getServerErrorResultCode();
      }
    }
@@ -346,11 +342,7 @@
    catch (Exception e)
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_EXTOP_INVALID_CLASS.
          get(String.valueOf(className), String.valueOf(config.dn()),
              String.valueOf(e));
      throw new ConfigException(message, e);
      throw new ConfigException(ERR_CONFIG_EXTOP_INVALID_CLASS.get(className, config.dn(), e), e);
    }

    // The handler has been successfully initialized.
@@ -393,10 +385,7 @@
    catch (Exception e)
    {
      logger.traceException(e);

      unacceptableReasons.add(ERR_CONFIG_EXTOP_INVALID_CLASS.get(className,
                              String.valueOf(config.dn()),
                              String.valueOf(e)));
      unacceptableReasons.add(ERR_CONFIG_EXTOP_INVALID_CLASS.get(className, config.dn(), e));
      return false;
    }


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

@@ -441,8 +441,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_EXTENSION_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -464,7 +464,7 @@
        {
          String reason = collectionToString(unacceptableReasons, ".  ");
          LocalizableMessage message = ERR_CONFIG_GROUP_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), reason);
              configuration.dn(), reason);
          throw new InitializationException(message);
        }
      }
@@ -474,8 +474,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_GROUP_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }
@@ -589,8 +588,7 @@
        filter = groupImplementation.getGroupDefinitionFilter();
        if (backend.getEntryCount() > 0 && ! backend.isIndexed(filter))
        {
          logger.warn(WARN_GROUP_FILTER_NOT_INDEXED.get(String.valueOf(filter),
                        String.valueOf(configEntryDN), backend.getBackendID()));
          logger.warn(WARN_GROUP_FILTER_NOT_INDEXED.get(filter, configEntryDN, backend.getBackendID()));
        }
      }
      catch (Exception e)

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

@@ -154,7 +154,7 @@
    }
    else if (! identityMappers.containsKey(mapperDN))
    {
      logger.error(ERR_CONFIG_IDMAPPER_INVALID_PROXY_MAPPER_DN.get(String.valueOf(mapperDN)));
      logger.error(ERR_CONFIG_IDMAPPER_INVALID_PROXY_MAPPER_DN.get(mapperDN));
    }
  }

@@ -451,8 +451,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_IDMAPPER_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -443,8 +443,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_KEYMANAGER_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -138,9 +138,7 @@
      }
      else
      {
        LocalizableMessage message = ERR_CONFIG_LOGGER_INVALID_OBJECTCLASS.get(
            String.valueOf(config.dn()));
        throw new ConfigException(message);
        throw new ConfigException(ERR_CONFIG_LOGGER_INVALID_OBJECTCLASS.get(config.dn()));
      }
    }

@@ -197,8 +195,7 @@
    }
    else
    {
      messages.add(ERR_CONFIG_LOGGER_INVALID_OBJECTCLASS.get(String
          .valueOf(config.dn())));
      messages.add(ERR_CONFIG_LOGGER_INVALID_OBJECTCLASS.get(config.dn()));
      return null;
    }
  }

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

@@ -228,10 +228,8 @@
      }
      catch (DirectoryException de)
      {
        LocalizableMessage message = WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR.get(
                String.valueOf(configuration.dn()),
                de.getMessageObject());
        messages.add(message);
        messages.add(WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR.get(
            configuration.dn(), de.getMessageObject()));

        if (resultCode == ResultCode.SUCCESS)
        {
@@ -553,9 +551,7 @@
      }
      catch (DirectoryException de)
      {
        LocalizableMessage message = WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR.get(
                String.valueOf(configuration.dn()), de.getMessageObject());
        messages.add(message);
        messages.add(WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR.get(configuration.dn(), de.getMessageObject()));

        if (resultCode == ResultCode.SUCCESS)
        {
@@ -652,8 +648,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_SCHEMA_MR_CANNOT_INITIALIZE.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -634,8 +634,7 @@
  private void updateOperationErrMsgAndResCode()
  {
    setResultCode(ResultCode.NO_SUCH_OBJECT);
    appendErrorMessage(ERR_MODDN_NO_BACKEND_FOR_CURRENT_ENTRY.get(
            String.valueOf(entryDN)));
    appendErrorMessage(ERR_MODDN_NO_BACKEND_FOR_CURRENT_ENTRY.get(entryDN));
  }


@@ -700,7 +699,7 @@
      if ((parentDN == null) || parentDN.isRootDN())
      {
        setResultCode(ResultCode.UNWILLING_TO_PERFORM);
        appendErrorMessage(ERR_MODDN_NO_PARENT.get(String.valueOf(entryDN)));
        appendErrorMessage(ERR_MODDN_NO_PARENT.get(entryDN));
      }
      newDN = parentDN.child(getNewRDN());
    }

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

@@ -253,9 +253,7 @@
             if(attr.hasOption("binary"))
             {
               throw new LDAPException(LDAPResultCode.UNDEFINED_ATTRIBUTE_TYPE,
                       ERR_ADD_ATTR_IS_INVALID_OPTION.get(
                       String.valueOf(entryDN),
                       attr.getName()));
                       ERR_ADD_ATTR_IS_INVALID_OPTION.get(entryDN, attr.getName()));
             }
           }

@@ -532,8 +530,7 @@
  private void updateOperationErrMsgAndResCode()
  {
    setResultCode(ResultCode.NO_SUCH_OBJECT);
    appendErrorMessage(
            ERR_MODIFY_NO_SUCH_ENTRY.get(String.valueOf(getEntryDN())));
    appendErrorMessage(ERR_MODIFY_NO_SUCH_ENTRY.get(getEntryDN()));
  }



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

@@ -398,8 +398,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_MONITOR_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -433,8 +433,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_PWGENERATOR_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -135,14 +135,11 @@
    if (null == DirectoryServer.getDefaultPasswordPolicy())
    {
      DN defaultPolicyDN = DirectoryServer.getDefaultPasswordPolicyDN();
      LocalizableMessage message = ERR_CONFIG_PWPOLICY_MISSING_DEFAULT_POLICY.get(String
          .valueOf(defaultPolicyDN));
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_PWPOLICY_MISSING_DEFAULT_POLICY.get(defaultPolicyDN));
    }

    // Process and register any password policy subentries.
    List<SubEntry> pwpSubEntries = DirectoryServer.getSubentryManager()
        .getSubentries();
    List<SubEntry> pwpSubEntries = DirectoryServer.getSubentryManager().getSubentries();
    if ((pwpSubEntries != null) && (!pwpSubEntries.isEmpty()))
    {
      for (SubEntry subentry : pwpSubEntries)
@@ -221,27 +218,18 @@
    }
    catch (ConfigException ce)
    {
      messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          String.valueOf(configuration.dn()), ce.getMessage()));

      return new ConfigChangeResult(ResultCode.CONSTRAINT_VIOLATION, false,
          messages);
      messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(configuration.dn(), ce.getMessage()));
      return new ConfigChangeResult(ResultCode.CONSTRAINT_VIOLATION, false, messages);
    }
    catch (InitializationException ie)
    {
      messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          String.valueOf(configuration.dn()), ie.getMessage()));

      return new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
          false, messages);
      messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(configuration.dn(), ie.getMessage()));
      return new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(), false, messages);
    }
    catch (Exception e)
    {
      messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          String.valueOf(configuration.dn()), stackTraceToSingleLineString(e)));

      return new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
          false, messages);
      messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(configuration.dn(), stackTraceToSingleLineString(e)));
      return new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(), false, messages);
    }
  }

@@ -260,9 +248,7 @@
    DN defaultPolicyDN = DirectoryServer.getDefaultPasswordPolicyDN();
    if ((defaultPolicyDN != null) && defaultPolicyDN.equals(configuration.dn()))
    {
      LocalizableMessage message = WARN_CONFIG_PWPOLICY_CANNOT_DELETE_DEFAULT_POLICY
          .get(String.valueOf(defaultPolicyDN));
      unacceptableReason.add(message);
      unacceptableReason.add(WARN_CONFIG_PWPOLICY_CANNOT_DELETE_DEFAULT_POLICY.get(defaultPolicyDN));
      return false;
    }
    else
@@ -288,14 +274,11 @@
    DN defaultPolicyDN = DirectoryServer.getDefaultPasswordPolicyDN();
    if ((defaultPolicyDN != null) && defaultPolicyDN.equals(policyDN))
    {
      messages.add(WARN_CONFIG_PWPOLICY_CANNOT_DELETE_DEFAULT_POLICY.get(String
          .valueOf(defaultPolicyDN)));
      return new ConfigChangeResult(ResultCode.CONSTRAINT_VIOLATION, false,
          messages);
      messages.add(WARN_CONFIG_PWPOLICY_CANNOT_DELETE_DEFAULT_POLICY.get(defaultPolicyDN));
      return new ConfigChangeResult(ResultCode.CONSTRAINT_VIOLATION, false, messages);
    }
    DirectoryServer.deregisterAuthenticationPolicy(policyDN);
    messages.add(INFO_CONFIG_PWPOLICY_REMOVED_POLICY.get(String
        .valueOf(policyDN)));
    messages.add(INFO_CONFIG_PWPOLICY_REMOVED_POLICY.get(policyDN));

    return new ConfigChangeResult(ResultCode.SUCCESS, false, messages);
  }
@@ -473,8 +456,7 @@
    {
      if (!(policyConfiguration instanceof PasswordPolicyCfg))
      {
        LocalizableMessage msg = ERR_CONFIG_PWPOLICY_DEFAULT_POLICY_IS_WRONG_TYPE
            .get(String.valueOf(policyConfiguration.dn()));
        LocalizableMessage msg = ERR_CONFIG_PWPOLICY_DEFAULT_POLICY_IS_WRONG_TYPE.get(policyConfiguration.dn());
        throw new ConfigException(msg);
      }
    }
@@ -497,8 +479,7 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          String.valueOf(policyConfiguration.dn()),
          stackTraceToSingleLineString(e));
          policyConfiguration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }

@@ -534,13 +515,11 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          String.valueOf(policyConfiguration.dn()),
          stackTraceToSingleLineString(e));
          policyConfiguration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }

    DirectoryServer.registerAuthenticationPolicy(policyConfiguration.dn(),
        policy);
    DirectoryServer.registerAuthenticationPolicy(policyConfiguration.dn(), policy);
  }


@@ -558,8 +537,7 @@
    {
      if (!(policyConfiguration instanceof PasswordPolicyCfg))
      {
        LocalizableMessage msg = ERR_CONFIG_PWPOLICY_DEFAULT_POLICY_IS_WRONG_TYPE
            .get(String.valueOf(policyConfiguration.dn()));
        LocalizableMessage msg = ERR_CONFIG_PWPOLICY_DEFAULT_POLICY_IS_WRONG_TYPE.get(policyConfiguration.dn());
        unacceptableReasons.add(msg);
        return false;
      }
@@ -592,8 +570,7 @@
      logger.traceException(e);

      unacceptableReasons.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
          String.valueOf(policyConfiguration.dn()),
          stackTraceToSingleLineString(e)));
          policyConfiguration.dn(), stackTraceToSingleLineString(e)));
      return false;
    }
  }

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

@@ -129,27 +129,20 @@
      }
      catch (ConfigException ce)
      {
        messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
            String.valueOf(configuration.dn()), ce.getMessage()));

        return new ConfigChangeResult(ResultCode.CONSTRAINT_VIOLATION, false,
            messages);
        messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(configuration.dn(), ce.getMessage()));
        return new ConfigChangeResult(ResultCode.CONSTRAINT_VIOLATION, false, messages);
      }
      catch (InitializationException ie)
      {
        messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
            String.valueOf(configuration.dn()), ie.getMessage()));

            configuration.dn(), ie.getMessage()));
        return new ConfigChangeResult(
            DirectoryServer.getServerErrorResultCode(), false, messages);
      }
      catch (Exception e)
      {
        messages
            .add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
                String.valueOf(configuration.dn()),
                stackTraceToSingleLineString(e)));

        messages.add(ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
            configuration.dn(), stackTraceToSingleLineString(e)));
        return new ConfigChangeResult(
            DirectoryServer.getServerErrorResultCode(), false, messages);
      }
@@ -170,22 +163,21 @@
      catch (ConfigException ce)
      {
        LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
            String.valueOf(configuration.dn()), ce.getMessage());
            configuration.dn(), ce.getMessage());
        unacceptableReasons.add(message);
        return false;
      }
      catch (InitializationException ie)
      {
        LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG.get(
            String.valueOf(configuration.dn()), ie.getMessage());
            configuration.dn(), ie.getMessage());
        unacceptableReasons.add(message);
        return false;
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CONFIG_PWPOLICY_INVALID_POLICY_CONFIG
            .get(String.valueOf(configuration.dn()),
                stackTraceToSingleLineString(e));
            .get(configuration.dn(), stackTraceToSingleLineString(e));
        unacceptableReasons.add(message);
        return false;
      }
@@ -247,10 +239,8 @@
          syntax = syntaxOID;
        }

        LocalizableMessage message = ERR_PWPOLICY_INVALID_PASSWORD_ATTRIBUTE_SYNTAX.get(
            String.valueOf(configEntryDN), passwordAttribute.getNameOrOID(),
            String.valueOf(syntax));
        throw new ConfigException(message);
        throw new ConfigException(ERR_PWPOLICY_INVALID_PASSWORD_ATTRIBUTE_SYNTAX.get(
            configEntryDN, passwordAttribute.getNameOrOID(), syntax));
      }

      // Get the default storage schemes. They must all reference valid storage
@@ -264,9 +254,8 @@

        if (authPasswordSyntax && (!scheme.supportsAuthPasswordSyntax()))
        {
          LocalizableMessage message = ERR_PWPOLICY_SCHEME_DOESNT_SUPPORT_AUTH.get(
              String.valueOf(schemeDN), passwordAttribute.getNameOrOID());
          throw new ConfigException(message);
          throw new ConfigException(ERR_PWPOLICY_SCHEME_DOESNT_SUPPORT_AUTH.get(
              schemeDN, passwordAttribute.getNameOrOID()));
        }

        defaultStorageSchemes.add(scheme);
@@ -287,15 +276,13 @@
          }
          else
          {
            LocalizableMessage message = ERR_PWPOLICY_DEPRECATED_SCHEME_NOT_AUTH.get(
                String.valueOf(configEntryDN), String.valueOf(schemeDN));
            throw new ConfigException(message);
            throw new ConfigException(ERR_PWPOLICY_DEPRECATED_SCHEME_NOT_AUTH.get(
                configEntryDN, schemeDN));
          }
        }
        else
        {
          deprecatedStorageSchemes.add(toLowerCase(scheme
              .getStorageSchemeName()));
          deprecatedStorageSchemes.add(toLowerCase(scheme.getStorageSchemeName()));
        }
      }

@@ -333,8 +320,7 @@
          && (configuration.getPasswordExpirationWarningInterval() <= 0))
      {
        LocalizableMessage message =
          ERR_PWPOLICY_MUST_HAVE_WARNING_IF_NOT_EXPIRE_WITHOUT_WARNING
            .get(String.valueOf(configEntryDN));
          ERR_PWPOLICY_MUST_HAVE_WARNING_IF_NOT_EXPIRE_WITHOUT_WARNING.get(configEntryDN);
        throw new ConfigException(message);
      }

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

        LocalizableMessage message = ERR_PWPOLICY_CANNOT_DETERMINE_REQUIRE_CHANGE_BY_TIME
            .get(String.valueOf(configEntryDN), getExceptionMessage(e));
            .get(configEntryDN, getExceptionMessage(e));
        throw new InitializationException(message, e);
      }

@@ -386,8 +372,7 @@
        {
          logger.traceException(e);

          LocalizableMessage message = ERR_PWPOLICY_INVALID_LAST_LOGIN_TIME_FORMAT.get(
              String.valueOf(configEntryDN), String.valueOf(formatString));
          LocalizableMessage message = ERR_PWPOLICY_INVALID_LAST_LOGIN_TIME_FORMAT.get(configEntryDN, formatString);
          throw new ConfigException(message);
        }
      }
@@ -409,8 +394,7 @@
            logger.traceException(e);

            LocalizableMessage message =
              ERR_PWPOLICY_INVALID_PREVIOUS_LAST_LOGIN_TIME_FORMAT
                .get(String.valueOf(configEntryDN), String.valueOf(s));
              ERR_PWPOLICY_INVALID_PREVIOUS_LAST_LOGIN_TIME_FORMAT.get(configEntryDN, s);
            throw new ConfigException(message);
          }
        }
@@ -431,15 +415,13 @@
              .getMaxPasswordAge())
          {
            LocalizableMessage message =
              ERR_PWPOLICY_MIN_AGE_PLUS_WARNING_GREATER_THAN_MAX_AGE
                .get(String.valueOf(configEntryDN));
              ERR_PWPOLICY_MIN_AGE_PLUS_WARNING_GREATER_THAN_MAX_AGE.get(configEntryDN);
            throw new ConfigException(message);
          }
        }
        else if (warnInterval >= configuration.getMaxPasswordAge())
        {
          LocalizableMessage message = ERR_PWPOLICY_WARNING_INTERVAL_LARGER_THAN_MAX_AGE
              .get(String.valueOf(configEntryDN));
          LocalizableMessage message = ERR_PWPOLICY_WARNING_INTERVAL_LARGER_THAN_MAX_AGE.get(configEntryDN);
          throw new ConfigException(message);
        }
      }

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

@@ -3653,7 +3653,7 @@
    if (resultCode != ResultCode.SUCCESS)
    {
      LocalizableMessage message = ERR_PWPSTATE_CANNOT_UPDATE_USER_ENTRY.get(userDNString,
                            String.valueOf(internalModify.getErrorMessage()));
                            internalModify.getErrorMessage());

      // If this is a root user, or if the password policy says that we should
      // ignore these problems, then log a warning message.  Otherwise, cause

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

@@ -246,9 +246,7 @@
    DN configEntryDN = configuration.dn();
    if (storageSchemes.containsKey(configEntryDN))
    {
      LocalizableMessage message = ERR_CONFIG_PWSCHEME_EXISTS.get(
              String.valueOf(configEntryDN));
      unacceptableReasons.add (message);
      unacceptableReasons.add (ERR_CONFIG_PWSCHEME_EXISTS.get(configEntryDN));
      status = false;
    }
    // If configuration is enabled then check that password storage scheme
@@ -460,9 +458,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_PWSCHEME_INITIALIZATION_FAILED.get(className,
          String.valueOf(configuration.dn()),
          stackTraceToSingleLineString(e)
          );
          configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -445,8 +445,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_PWVALIDATOR_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -401,8 +401,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_PLUGIN_CANNOT_INITIALIZE.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }
@@ -1456,23 +1455,20 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_PLUGIN_STARTUP_PLUGIN_EXCEPTION.get(
                String.valueOf(p.getPluginEntryDN()),
                stackTraceToSingleLineString(e));

                p.getPluginEntryDN(), stackTraceToSingleLineString(e));
        return PluginResult.Startup.stopStartup(message);
      }

      if (result == null)
      {
        LocalizableMessage message = ERR_PLUGIN_STARTUP_PLUGIN_RETURNED_NULL.get(
            String.valueOf(p.getPluginEntryDN()));
        LocalizableMessage message = ERR_PLUGIN_STARTUP_PLUGIN_RETURNED_NULL.get(p.getPluginEntryDN());
        logger.error(message);
        return PluginResult.Startup.stopStartup(message);
      }
      else if (! result.continueProcessing())
      {
        LocalizableMessage message = ERR_PLUGIN_STARTUP_PLUGIN_FAIL_ABORT.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                result.getErrorMessage(),
                result.getErrorMessage().ordinal());
        logger.error(message);
@@ -1511,8 +1507,7 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_PLUGIN_SHUTDOWN_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
                stackTraceToSingleLineString(e));
            get(p.getPluginEntryDN(), stackTraceToSingleLineString(e));
        logger.error(message);
      }
    }
@@ -1544,7 +1539,7 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_PLUGIN_POST_CONNECT_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                clientConnection.getConnectionID(),
                clientConnection.getClientAddress(),
                stackTraceToSingleLineString(e));
@@ -1558,9 +1553,7 @@
      if (result == null)
      {
        LocalizableMessage message = ERR_PLUGIN_POST_CONNECT_PLUGIN_RETURNED_NULL.
            get(String.valueOf(p.getPluginEntryDN()),
                clientConnection.getConnectionID(),
                clientConnection.getClientAddress());
            get(p.getPluginEntryDN(), clientConnection.getConnectionID(), clientConnection.getClientAddress());
        logger.error(message);

        return PluginResult.PostConnect.disconnectClient(
@@ -1615,7 +1608,7 @@
        logger.traceException(e);

        LocalizableMessage msg = ERR_PLUGIN_POST_DISCONNECT_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                clientConnection.getConnectionID(),
                clientConnection.getClientAddress(),
                stackTraceToSingleLineString(e));
@@ -1626,7 +1619,7 @@
      if (result == null)
      {
        LocalizableMessage msg = ERR_PLUGIN_POST_DISCONNECT_PLUGIN_RETURNED_NULL.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                clientConnection.getConnectionID(),
                clientConnection.getClientAddress());
        logger.error(msg);
@@ -1675,9 +1668,8 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_PLUGIN_LDIF_IMPORT_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
                String.valueOf(entry.getName()),
                stackTraceToSingleLineString(e));
get(p.getPluginEntryDN(),
                entry.getName(), stackTraceToSingleLineString(e));
        logger.error(message);

        return PluginResult.ImportLDIF.stopEntryProcessing(message);
@@ -1686,8 +1678,7 @@
      if (result == null)
      {
        LocalizableMessage message = ERR_PLUGIN_LDIF_IMPORT_PLUGIN_RETURNED_NULL.
            get(String.valueOf(p.getPluginEntryDN()),
                String.valueOf(entry.getName()));
            get(p.getPluginEntryDN(), entry.getName());
        logger.error(message);

        return PluginResult.ImportLDIF.stopEntryProcessing(message);
@@ -1772,8 +1763,8 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_PLUGIN_LDIF_EXPORT_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
                String.valueOf(entry.getName()),
            get(p.getPluginEntryDN(),
                entry.getName(),
                stackTraceToSingleLineString(e));
        logger.error(message);

@@ -1783,8 +1774,7 @@
      if (result == null)
      {
        LocalizableMessage message = ERR_PLUGIN_LDIF_EXPORT_PLUGIN_RETURNED_NULL.
            get(String.valueOf(p.getPluginEntryDN()),
                String.valueOf(entry.getName()));
            get(p.getPluginEntryDN(), entry.getName());
        logger.error(message);

        return PluginResult.ImportLDIF.stopEntryProcessing(message);
@@ -1866,7 +1856,7 @@

    LocalizableMessage message =
        ERR_PLUGIN_PRE_PARSE_PLUGIN_EXCEPTION.get(operation.getOperationType()
            .getOperationName(), String.valueOf(plugin.getPluginEntryDN()),
            .getOperationName(), plugin.getPluginEntryDN(),
            operation.getConnectionID(), operation.getOperationID(),
            stackTraceToSingleLineString(e));
    logger.error(message);
@@ -1880,9 +1870,8 @@
  {
    LocalizableMessage message =
        ERR_PLUGIN_PRE_PARSE_PLUGIN_RETURNED_NULL.get(operation
            .getOperationType().getOperationName(), String.valueOf(plugin
            .getPluginEntryDN()), operation.getConnectionID(), String
            .valueOf(operation.getOperationID()));
            .getOperationType().getOperationName(), plugin
            .getPluginEntryDN(), operation.getConnectionID(), operation.getOperationID());
    logger.error(message);

    return PluginResult.PreParse.stopProcessing(DirectoryServer
@@ -2665,8 +2654,8 @@

    LocalizableMessage message =
        ERR_PLUGIN_PRE_OPERATION_PLUGIN_EXCEPTION.get(operation
            .getOperationType().getOperationName(), String.valueOf(plugin
            .getPluginEntryDN()), operation.getConnectionID(), operation
            .getOperationType().getOperationName(), plugin
            .getPluginEntryDN(), operation.getConnectionID(), operation
            .getOperationID(), stackTraceToSingleLineString(e));
    logger.error(message);

@@ -2682,8 +2671,8 @@
  {
    LocalizableMessage message =
        ERR_PLUGIN_PRE_OPERATION_PLUGIN_RETURNED_NULL.get(operation
            .getOperationType().getOperationName(), String.valueOf(plugin
            .getPluginEntryDN()), operation.getConnectionID(), operation
            .getOperationType().getOperationName(), plugin
            .getPluginEntryDN(), operation.getConnectionID(), operation
            .getOperationID());
    logger.error(message);

@@ -2989,7 +2978,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(abandonOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                abandonOperation.getConnectionID(),
                abandonOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -3000,7 +2989,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(abandonOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                abandonOperation.getConnectionID(),
                abandonOperation.getOperationID());
        logger.error(message);
@@ -3074,7 +3063,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(addOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                addOperation.getConnectionID(), addOperation.getOperationID(),
                stackTraceToSingleLineString(e));
        logger.error(message);
@@ -3084,7 +3073,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(addOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                addOperation.getConnectionID(), addOperation.getOperationID());
        logger.error(message);
      }
@@ -3157,7 +3146,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(bindOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                bindOperation.getConnectionID(), bindOperation.getOperationID(),
                stackTraceToSingleLineString(e));
        logger.error(message);
@@ -3167,7 +3156,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(bindOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                bindOperation.getConnectionID(),
                bindOperation.getOperationID());
        logger.error(message);
@@ -3241,7 +3230,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(compareOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                compareOperation.getConnectionID(),
                compareOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -3252,7 +3241,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(compareOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                compareOperation.getConnectionID(),
                compareOperation.getOperationID());
        logger.error(message);
@@ -3326,7 +3315,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(deleteOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                deleteOperation.getConnectionID(),
                deleteOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -3337,7 +3326,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(deleteOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                deleteOperation.getConnectionID(),
                deleteOperation.getOperationID());
        logger.error(message);
@@ -3411,7 +3400,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(extendedOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                extendedOperation.getConnectionID(),
                extendedOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -3422,7 +3411,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(extendedOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                extendedOperation.getConnectionID(),
                extendedOperation.getOperationID());
        logger.error(message);
@@ -3496,7 +3485,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(modifyOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyOperation.getConnectionID(),
                modifyOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -3507,7 +3496,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(modifyOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyOperation.getConnectionID(),
                modifyOperation.getOperationID());
        logger.error(message);
@@ -3580,7 +3569,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(modifyDNOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyDNOperation.getConnectionID(),
                modifyDNOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -3591,7 +3580,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(modifyDNOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyDNOperation.getConnectionID(),
                modifyDNOperation.getOperationID());
        logger.error(message);
@@ -3665,7 +3654,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(searchOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                searchOperation.getConnectionID(),
                searchOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -3676,7 +3665,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(searchOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                searchOperation.getConnectionID(),
                searchOperation.getOperationID());
        logger.error(message);
@@ -3750,7 +3739,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_EXCEPTION.
            get(unbindOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                unbindOperation.getConnectionID(),
                unbindOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -3761,7 +3750,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_OPERATION_PLUGIN_RETURNED_NULL.
            get(unbindOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                unbindOperation.getConnectionID(),
                unbindOperation.getOperationID());
        logger.error(message);
@@ -3826,7 +3815,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(addOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                addOperation.getConnectionID(), addOperation.getOperationID(),
                stackTraceToSingleLineString(e));
        logger.error(message);
@@ -3836,7 +3825,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
            get(addOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                addOperation.getConnectionID(), addOperation.getOperationID());
        logger.error(message);
      }
@@ -3890,7 +3879,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(bindOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                bindOperation.getConnectionID(), bindOperation.getOperationID(),
                stackTraceToSingleLineString(e));
        logger.error(message);
@@ -3900,7 +3889,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
            get(bindOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                bindOperation.getConnectionID(),
                bindOperation.getOperationID());
        logger.error(message);
@@ -3955,7 +3944,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(compareOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                compareOperation.getConnectionID(),
                compareOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -3966,7 +3955,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
            get(compareOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                compareOperation.getConnectionID(),
                compareOperation.getOperationID());
        logger.error(message);
@@ -4021,7 +4010,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(deleteOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                deleteOperation.getConnectionID(),
                deleteOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4032,7 +4021,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
            get(deleteOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                deleteOperation.getConnectionID(),
                deleteOperation.getOperationID());
        logger.error(message);
@@ -4086,7 +4075,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(extendedOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                extendedOperation.getConnectionID(),
                extendedOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4097,7 +4086,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
            get(extendedOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                extendedOperation.getConnectionID(),
                extendedOperation.getOperationID());
        logger.error(message);
@@ -4152,7 +4141,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(modifyOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyOperation.getConnectionID(),
                modifyOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4163,7 +4152,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
            get(modifyOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyOperation.getConnectionID(),
                modifyOperation.getOperationID());
        logger.error(message);
@@ -4218,7 +4207,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(modifyDNOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyDNOperation.getConnectionID(),
                modifyDNOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4229,7 +4218,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
            get(modifyDNOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyDNOperation.getConnectionID(),
                modifyDNOperation.getOperationID());
        logger.error(message);
@@ -4284,7 +4273,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_EXCEPTION.
            get(searchOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                searchOperation.getConnectionID(),
                searchOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4295,7 +4284,7 @@
      {
        LocalizableMessage message = ERR_PLUGIN_POST_RESPONSE_PLUGIN_RETURNED_NULL.
            get(searchOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                searchOperation.getConnectionID(),
                searchOperation.getOperationID());
        logger.error(message);
@@ -4340,7 +4329,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
            get(addOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                addOperation.getConnectionID(), addOperation.getOperationID(),
                stackTraceToSingleLineString(e));
        logger.error(message);
@@ -4372,7 +4361,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
            get(deleteOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                deleteOperation.getConnectionID(),
                deleteOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4405,7 +4394,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
            get(modifyOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyOperation.getConnectionID(),
                modifyOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4438,7 +4427,7 @@

        LocalizableMessage message = ERR_PLUGIN_POST_SYNCHRONIZATION_PLUGIN_EXCEPTION.
            get(modifyDNOperation.getOperationType().getOperationName(),
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyDNOperation.getConnectionID(),
                modifyDNOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4482,10 +4471,10 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_PLUGIN_SEARCH_ENTRY_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                searchOperation.getConnectionID(),
                searchOperation.getOperationID(),
                String.valueOf(searchEntry.getName()),
                searchEntry.getName(),
                stackTraceToSingleLineString(e));
        logger.error(message);

@@ -4496,10 +4485,10 @@
      if (result == null)
      {
        LocalizableMessage message = ERR_PLUGIN_SEARCH_ENTRY_PLUGIN_RETURNED_NULL.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                searchOperation.getConnectionID(),
                searchOperation.getOperationID(),
                String.valueOf(searchEntry.getName()));
                searchEntry.getName());
        logger.error(message);

        return PluginResult.IntermediateResponse.stopProcessing(false,
@@ -4557,7 +4546,7 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_PLUGIN_SEARCH_REFERENCE_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                searchOperation.getConnectionID(),
                searchOperation.getOperationID(),
                searchReference.getReferralURLString(),
@@ -4571,7 +4560,7 @@
      if (result == null)
      {
        LocalizableMessage message = ERR_PLUGIN_SEARCH_REFERENCE_PLUGIN_RETURNED_NULL.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                searchOperation.getConnectionID(),
                searchOperation.getOperationID(),
                searchReference.getReferralURLString());
@@ -4639,7 +4628,7 @@

        LocalizableMessage message =
            ERR_PLUGIN_SUBORDINATE_MODIFY_DN_PLUGIN_EXCEPTION.get(
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                modifyDNOperation.getConnectionID(),
                modifyDNOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4653,9 +4642,9 @@
      {
        LocalizableMessage message =
            ERR_PLUGIN_SUBORDINATE_MODIFY_DN_PLUGIN_RETURNED_NULL.get(
                        String.valueOf(p.getPluginEntryDN()),
                        p.getPluginEntryDN(),
                        modifyDNOperation.getConnectionID(),
                        String.valueOf(modifyDNOperation.getOperationID()));
                        modifyDNOperation.getOperationID());
        logger.error(message);

        return PluginResult.SubordinateModifyDN.stopProcessing(
@@ -4712,7 +4701,7 @@

        LocalizableMessage message =
            ERR_PLUGIN_SUBORDINATE_DELETE_PLUGIN_EXCEPTION.get(
                String.valueOf(p.getPluginEntryDN()),
                p.getPluginEntryDN(),
                deleteOperation.getConnectionID(),
                deleteOperation.getOperationID(),
                stackTraceToSingleLineString(e));
@@ -4726,9 +4715,9 @@
      {
        LocalizableMessage message =
            ERR_PLUGIN_SUBORDINATE_DELETE_PLUGIN_RETURNED_NULL.get(
                        String.valueOf(p.getPluginEntryDN()),
                        p.getPluginEntryDN(),
                        deleteOperation.getConnectionID(),
                        String.valueOf(deleteOperation.getOperationID()));
                        deleteOperation.getOperationID());
        logger.error(message);

        return PluginResult.SubordinateDelete.stopProcessing(
@@ -4779,7 +4768,7 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_PLUGIN_INTERMEDIATE_RESPONSE_PLUGIN_EXCEPTION.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                operation.getConnectionID(), operation.getOperationID(),
                stackTraceToSingleLineString(e));
        logger.error(message);
@@ -4791,7 +4780,7 @@
      if (result == null)
      {
        LocalizableMessage message = ERR_PLUGIN_INTERMEDIATE_RESPONSE_PLUGIN_RETURNED_NULL.
            get(String.valueOf(p.getPluginEntryDN()),
            get(p.getPluginEntryDN(),
                operation.getConnectionID(), operation.getOperationID());
        logger.error(message);


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

@@ -178,13 +178,8 @@
      DN existingRootDN = DirectoryServer.getActualRootBindDN(altBindDN);
      if (existingRootDN != null)
      {

        LocalizableMessage message = ERR_CONFIG_ROOTDN_CONFLICTING_MAPPING.get(
                String.valueOf(altBindDN),
                String.valueOf(configuration.dn()),
                String.valueOf(existingRootDN));
        unacceptableReasons.add(message);

        unacceptableReasons.add(ERR_CONFIG_ROOTDN_CONFLICTING_MAPPING.get(
            altBindDN, configuration.dn(), existingRootDN));
        configAcceptable = false;
      }
    }
@@ -293,12 +288,8 @@
      if ((existingRootDN != null) &&
          (! existingRootDN.equals(configuration.dn())))
      {
        LocalizableMessage message = ERR_CONFIG_ROOTDN_CONFLICTING_MAPPING.get(
                String.valueOf(altBindDN),
                String.valueOf(configuration.dn()),
                String.valueOf(existingRootDN));
        unacceptableReasons.add(message);

        unacceptableReasons.add(ERR_CONFIG_ROOTDN_CONFLICTING_MAPPING.get(
            altBindDN, configuration.dn(), existingRootDN));
        configAcceptable = false;
      }
    }

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

@@ -433,8 +433,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_SASL_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -29,7 +29,6 @@
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.AuthenticationPolicyState;
import org.opends.server.api.ClientConnection;
import org.opends.server.api.plugin.PluginResult;
@@ -1351,9 +1350,7 @@
  private void updateOperationErrMsgAndResCode()
  {
    setResultCode(ResultCode.NO_SUCH_OBJECT);
    LocalizableMessage message =
            ERR_SEARCH_BASE_DOESNT_EXIST.get(String.valueOf(getBaseDN()));
    appendErrorMessage(message);
    appendErrorMessage(ERR_SEARCH_BASE_DOESNT_EXIST.get(getBaseDN()));
  }



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

@@ -320,7 +320,7 @@
            ")");
      if (backend.getEntryCount() > 0 && ! backend.isIndexed(filter))
      {
        logger.warn(WARN_SUBENTRY_FILTER_NOT_INDEXED.get(String.valueOf(filter), backend.getBackendID()));
        logger.warn(WARN_SUBENTRY_FILTER_NOT_INDEXED.get(filter, backend.getBackendID()));
      }
    }
    catch (Exception e)

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

@@ -206,8 +206,7 @@
        }

        LocalizableMessage message = ERR_PWPOLICY_INVALID_PASSWORD_ATTRIBUTE_SYNTAX.get(
            String.valueOf(passwordPolicySubentryDN),
            pPasswordAttribute.getNameOrOID(), String.valueOf(syntax));
            passwordPolicySubentryDN, pPasswordAttribute.getNameOrOID(), syntax);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }
    }

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

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

          messages.add(ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(
                  String.valueOf(configuration.getJavaClass()),
                  String.valueOf(configuration.dn())));
              configuration.getJavaClass(), configuration.dn()));
          resultCode = DirectoryServer.getServerErrorResultCode();
        }
      }
@@ -308,8 +307,7 @@
        logger.traceException(e);

        messages.add(ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(
                String.valueOf(configuration.getJavaClass()),
                           String.valueOf(configuration.dn())));
            configuration.getJavaClass(), configuration.dn()));
        resultCode = DirectoryServer.getServerErrorResultCode();
      }
    }
@@ -370,8 +368,7 @@
    {
       // Handle the exception: put a message in the unacceptable reasons.
       LocalizableMessage message = ERR_CONFIG_SYNCH_UNABLE_TO_LOAD_PROVIDER_CLASS.
           get(String.valueOf(className), String.valueOf(configuration.dn()),
               stackTraceToSingleLineString(e));
           get(className, configuration.dn(), stackTraceToSingleLineString(e));
       throw new ConfigException(message, e);
    }
    try
@@ -382,8 +379,7 @@
    {
      // Handle the exception: put a message in the unacceptable reasons.
      LocalizableMessage message = ERR_CONFIG_SYNCH_UNABLE_TO_INSTANTIATE_PROVIDER.
          get(String.valueOf(className), String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new ConfigException(message, e);
    }
    try
@@ -401,7 +397,7 @@

      // Handle the exception: put a message in the unacceptable reasons.
      LocalizableMessage message = ERR_CONFIG_SYNCH_ERROR_INITIALIZING_PROVIDER.get(
              String.valueOf(className), String.valueOf(configuration.dn()));
              className, configuration.dn());
      throw new ConfigException(message, e);
    }
    return provider;
@@ -439,9 +435,7 @@
    {
       // Handle the exception: put a message in the unacceptable reasons.
       LocalizableMessage message = ERR_CONFIG_SYNCH_UNABLE_TO_LOAD_PROVIDER_CLASS.get(
               String.valueOf(className),
               String.valueOf(configuration.dn()),
               stackTraceToSingleLineString(e));
           className, configuration.dn(), stackTraceToSingleLineString(e));
       unacceptableReasons.add(message);
       return false;
    }
@@ -465,9 +459,7 @@
    {
      // Handle the exception: put a message in the unacceptable reasons.
      LocalizableMessage message = ERR_CONFIG_SYNCH_UNABLE_TO_INSTANTIATE_PROVIDER.get(
              String.valueOf(className),
              String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          className, configuration.dn(), stackTraceToSingleLineString(e));
      unacceptableReasons.add(message);
      return false;
    }

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

@@ -441,8 +441,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_TRUSTMANAGER_INITIALIZATION_FAILED.
          get(className, String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
          get(className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -136,8 +136,7 @@
            if (provider.isMultiValued())
            {
              LocalizableMessage message = ERR_CONFIG_VATTR_SV_TYPE_WITH_MV_PROVIDER.
                  get(String.valueOf(cfg.dn()),
                      cfg.getAttributeType().getNameOrOID(), className);
                  get(cfg.dn(), cfg.getAttributeType().getNameOrOID(), className);
              throw new ConfigException(message);
            }
            else if (cfg.getConflictBehavior() ==
@@ -145,8 +144,7 @@
                          MERGE_REAL_AND_VIRTUAL)
            {
              LocalizableMessage message = ERR_CONFIG_VATTR_SV_TYPE_WITH_MERGE_VALUES.
                  get(String.valueOf(cfg.dn()),
                      cfg.getAttributeType().getNameOrOID());
                  get(cfg.dn(), cfg.getAttributeType().getNameOrOID());
              throw new ConfigException(message);
            }
          }
@@ -217,9 +215,7 @@
        logger.traceException(de);

        LocalizableMessage message = ERR_CONFIG_VATTR_INVALID_SEARCH_FILTER.get(
                filterString,
                String.valueOf(cfg.dn()),
                de.getMessageObject());
            filterString, cfg.dn(), de.getMessageObject());
        unacceptableReasons.put(message, de);
      }
    }
@@ -467,8 +463,7 @@
        if (!provider.isConfigurationAcceptable(cfg, unacceptableReasons))
        {
          String reasons = collectionToString(unacceptableReasons, ".  ");
          LocalizableMessage message = ERR_CONFIG_VATTR_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(cfg.dn()), reasons);
          LocalizableMessage message = ERR_CONFIG_VATTR_CONFIG_NOT_ACCEPTABLE.get(cfg.dn(), reasons);
          throw new InitializationException(message);
        }
      }
@@ -478,8 +473,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_VATTR_INITIALIZATION_FAILED.
          get(className, String.valueOf(cfg.dn()),
              stackTraceToSingleLineString(e));
          get(className, cfg.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -120,9 +120,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_WORK_QUEUE_INITIALIZATION_FAILED.
          get(workQueueConfig.getJavaClass(),
              String.valueOf(workQueueConfig.dn()),
              stackTraceToSingleLineString(e));
          get(workQueueConfig.getJavaClass(), workQueueConfig.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }

 opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroup.java

@@ -756,9 +756,7 @@

      unacceptableReasons
          .add(ERR_CONFIG_NETWORK_GROUP_POLICY_CANNOT_INITIALIZE.get(
              String.valueOf(className), String
                  .valueOf(policyConfiguration.dn()),
              stackTraceToSingleLineString(e)));
              className, policyConfiguration.dn(), stackTraceToSingleLineString(e)));
      return false;
    }

@@ -1613,10 +1611,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_CONFIG_NETWORK_GROUP_POLICY_CANNOT_INITIALIZE.get(String
              .valueOf(className), String.valueOf(policyConfiguration
              .dn()), stackTraceToSingleLineString(e));
      LocalizableMessage message = ERR_CONFIG_NETWORK_GROUP_POLICY_CANNOT_INITIALIZE.get(
          className, policyConfiguration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }

@@ -1653,10 +1649,8 @@

      logger.traceException(e);

      LocalizableMessage message =
          ERR_CONFIG_NETWORK_GROUP_POLICY_CANNOT_INITIALIZE.get(String
              .valueOf(className), String.valueOf(policyConfiguration
              .dn()), stackTraceToSingleLineString(e));
      LocalizableMessage message = ERR_CONFIG_NETWORK_GROUP_POLICY_CANNOT_INITIALIZE.get(
          className, policyConfiguration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }


 opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupConfigManager.java

@@ -269,8 +269,7 @@
          unacceptableReasons))
      {
        LocalizableMessage message =
            ERR_CONFIG_NETWORK_GROUP_CONFIG_NOT_ACCEPTABLE.get(String
                .valueOf(configuration.dn()), StaticUtils.listToString(
            ERR_CONFIG_NETWORK_GROUP_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), StaticUtils.listToString(
                unacceptableReasons, ". "));
        throw new InitializationException(message);
      }

 opendj3-server-dev/src/server/org/opends/server/core/networkgroups/NetworkGroupStatistics.java

@@ -24,13 +24,11 @@
 *      Copyright 2009-2010 Sun Microsystems, Inc.
 *      Portions Copyright 2013-2014 ForgeRock AS.
 */

package org.opends.server.core.networkgroups;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicLong;
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.admin.std.server.MonitorProviderCfg;
import org.opends.server.api.MonitorProvider;
import org.opends.server.config.ConfigException;
@@ -142,9 +140,7 @@
    // dynamically loaded from the configuration.  Rather, it should be
    // explicitly created and registered by the LDAP connection handler or an
    // LDAP client connection.
    LocalizableMessage message = ERR_LDAP_STATS_INVALID_MONITOR_INITIALIZATION.get(
        String.valueOf(configuration.dn()));
    throw new ConfigException(message);
    throw new ConfigException(ERR_LDAP_STATS_INVALID_MONITOR_INITIALIZATION.get(configuration.dn()));
  }

  /**

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

@@ -328,8 +328,7 @@
      if (readLock == null)
      {
        bindOperation.setResultCode(ResultCode.BUSY);
        bindOperation.setAuthFailureReason(INFO_SASLCRAMMD5_CANNOT_LOCK_ENTRY
            .get(String.valueOf(userDN)));
        bindOperation.setAuthFailureReason(INFO_SASLCRAMMD5_CANNOT_LOCK_ENTRY.get(userDN));
        return;
      }

@@ -343,8 +342,7 @@

        bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

        LocalizableMessage message = ERR_SASLCRAMMD5_CANNOT_GET_ENTRY_BY_DN.get(
                String.valueOf(userDN), de.getMessageObject());
        LocalizableMessage message = ERR_SASLCRAMMD5_CANNOT_GET_ENTRY_BY_DN.get(userDN, de.getMessageObject());
        bindOperation.setAuthFailureReason(message);
        return;
      }
@@ -371,8 +369,7 @@

        bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

        LocalizableMessage message = ERR_SASLCRAMMD5_CANNOT_MAP_USERNAME.get(
                String.valueOf(userName), de.getMessageObject());
        LocalizableMessage message = ERR_SASLCRAMMD5_CANNOT_MAP_USERNAME.get(userName, de.getMessageObject());
        bindOperation.setAuthFailureReason(message);
        return;
      }
@@ -405,7 +402,7 @@
      {
        bindOperation.setResultCode(ResultCode.INAPPROPRIATE_AUTHENTICATION);
        LocalizableMessage message = ERR_SASL_ACCOUNT_NOT_LOCAL
            .get(SASL_MECHANISM_CRAM_MD5, String.valueOf(userEntry.getName()));
            .get(SASL_MECHANISM_CRAM_MD5, userEntry.getName());
        bindOperation.setAuthFailureReason(message);
        return;
      }
@@ -416,8 +413,7 @@
      {
        bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

        LocalizableMessage message = ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS.get(
                String.valueOf(userEntry.getName()));
        LocalizableMessage message = ERR_SASLCRAMMD5_NO_REVERSIBLE_PASSWORDS.get(userEntry.getName());
        bindOperation.setAuthFailureReason(message);
        return;
      }
@@ -426,9 +422,7 @@
    {
      bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

      LocalizableMessage message = ERR_SASLCRAMMD5_CANNOT_GET_REVERSIBLE_PASSWORDS.get(
              String.valueOf(userEntry.getName()),
              String.valueOf(e));
      LocalizableMessage message = ERR_SASLCRAMMD5_CANNOT_GET_REVERSIBLE_PASSWORDS.get( userEntry.getName(), e);
      bindOperation.setAuthFailureReason(message);
      return;
    }

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

@@ -181,8 +181,7 @@
      }
      if ((! found) && (! config.isAllowUnclassifiedCharacters()))
      {
        invalidReason.append(ERR_CHARSET_VALIDATOR_ILLEGAL_CHARACTER.get(
                String.valueOf(c)));
        invalidReason.append(ERR_CHARSET_VALIDATOR_ILLEGAL_CHARACTER.get(c));
        return false;
      }
    }
@@ -361,9 +360,7 @@
        char c = characterSet.charAt(i);
        if (usedCharacters.contains(c))
        {
          LocalizableMessage message = ERR_CHARSET_VALIDATOR_DUPLICATE_CHAR.get(
              definition, String.valueOf(c));
          throw new ConfigException(message);
          throw new ConfigException(ERR_CHARSET_VALIDATOR_DUPLICATE_CHAR.get(definition, c));
        }

        usedCharacters.add(c);

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

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

      LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_VERIFY_EXISTENCE.get(
                             f.getAbsolutePath(), String.valueOf(e));
      LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_VERIFY_EXISTENCE.get(f.getAbsolutePath(), e);
      throw new InitializationException(message);
    }

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

      LocalizableMessage message = ERR_CONFIG_UNABLE_TO_APPLY_STARTUP_CHANGES.get(
          changesFile.getAbsolutePath(), String.valueOf(e));
          changesFile.getAbsolutePath(), e);
      throw new InitializationException(message, e);
    }

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

      LocalizableMessage message = ERR_CONFIG_FILE_CANNOT_OPEN_FOR_READ.get(
                             f.getAbsolutePath(), String.valueOf(e));
                             f.getAbsolutePath(), e);
      throw new InitializationException(message, e);
    }

@@ -344,7 +343,7 @@
      close(reader);

      LocalizableMessage message = ERR_CONFIG_FILE_INVALID_LDIF_ENTRY.get(
          le.getLineNumber(), f.getAbsolutePath(), String.valueOf(le));
          le.getLineNumber(), f.getAbsolutePath(), le);
      throw new InitializationException(message, le);
    }
    catch (Exception e)
@@ -354,8 +353,7 @@
      close(reader);

      LocalizableMessage message =
          ERR_CONFIG_FILE_READ_ERROR.get(f.getAbsolutePath(),
                                       String.valueOf(e));
          ERR_CONFIG_FILE_READ_ERROR.get(f.getAbsolutePath(), e);
      throw new InitializationException(message, e);
    }

@@ -394,8 +392,7 @@
      close(reader);

      // This should not happen, so we can use a generic error here.
      LocalizableMessage message = ERR_CONFIG_FILE_GENERIC_ERROR.get(f.getAbsolutePath(),
                                                          String.valueOf(e));
      LocalizableMessage message = ERR_CONFIG_FILE_GENERIC_ERROR.get(f.getAbsolutePath(), e);
      throw new InitializationException(message, e);
    }

@@ -423,8 +420,7 @@
        close(reader);

        LocalizableMessage message = ERR_CONFIG_FILE_INVALID_LDIF_ENTRY.get(
                               le.getLineNumber(), f.getAbsolutePath(),
                               String.valueOf(le));
                               le.getLineNumber(), f.getAbsolutePath(), le);
        throw new InitializationException(message, le);
      }
      catch (Exception e)
@@ -433,8 +429,7 @@

        close(reader);

        LocalizableMessage message = ERR_CONFIG_FILE_READ_ERROR.get(f.getAbsolutePath(),
                                                         String.valueOf(e));
        LocalizableMessage message = ERR_CONFIG_FILE_READ_ERROR.get(f.getAbsolutePath(), e);
        throw new InitializationException(message, e);
      }

@@ -494,8 +489,7 @@

        close(reader);

        LocalizableMessage message = ERR_CONFIG_FILE_GENERIC_ERROR.get(f.getAbsolutePath(),
                                                            String.valueOf(e));
        LocalizableMessage message = ERR_CONFIG_FILE_GENERIC_ERROR.get(f.getAbsolutePath(), e);
        throw new InitializationException(message, e);
      }
    }
@@ -619,7 +613,7 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_CANNOT_REGISTER_AS_PRIVATE_SUFFIX.get(
          String.valueOf(configRootEntry.getDN()), getExceptionMessage(e));
          configRootEntry.getDN(), getExceptionMessage(e));
      throw new InitializationException(message, e);
    }
  }
@@ -1127,8 +1121,7 @@
      DN entryDN = e.getName();
      if (configEntries.containsKey(entryDN))
      {
        LocalizableMessage message =
            ERR_CONFIG_FILE_ADD_ALREADY_EXISTS.get(String.valueOf(entryDN));
        LocalizableMessage message = ERR_CONFIG_FILE_ADD_ALREADY_EXISTS.get(entryDN);
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
      }

@@ -1138,8 +1131,7 @@
      if (parentDN == null)
      {
        // The entry DN doesn't have a parent.  This is not allowed.
        LocalizableMessage message =
            ERR_CONFIG_FILE_ADD_NO_PARENT_DN.get(String.valueOf(entryDN));
        LocalizableMessage message = ERR_CONFIG_FILE_ADD_NO_PARENT_DN.get(entryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }

@@ -1147,9 +1139,7 @@
      if (parentEntry == null)
      {
        // The parent entry does not exist.  This is not allowed.
        LocalizableMessage message = ERR_CONFIG_FILE_ADD_NO_PARENT.get(
                String.valueOf(entryDN),
                String.valueOf(parentDN));
        LocalizableMessage message = ERR_CONFIG_FILE_ADD_NO_PARENT.get(entryDN, parentDN);

        // Get the matched DN, if possible.
        DN matchedDN = null;
@@ -1183,8 +1173,7 @@
        if (! l.configAddIsAcceptable(newEntry, unacceptableReason))
        {
          LocalizableMessage message = ERR_CONFIG_FILE_ADD_REJECTED_BY_LISTENER.
              get(String.valueOf(entryDN), String.valueOf(parentDN),
                  String.valueOf(unacceptableReason));
              get(entryDN, parentDN, unacceptableReason);
          throw new DirectoryException(
                  ResultCode.UNWILLING_TO_PERFORM, message);

@@ -1204,11 +1193,8 @@
      {
        logger.traceException(ce);

        LocalizableMessage message = ERR_CONFIG_FILE_ADD_FAILED.
            get(String.valueOf(entryDN), String.valueOf(parentDN),
                getExceptionMessage(ce));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message);
        LocalizableMessage message = ERR_CONFIG_FILE_ADD_FAILED.get(entryDN, parentDN, getExceptionMessage(ce));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      }


@@ -1247,8 +1233,7 @@
          }
        }

        LocalizableMessage message =
            ERR_CONFIG_FILE_ADD_APPLY_FAILED.get(String.valueOf(buffer));
        LocalizableMessage message = ERR_CONFIG_FILE_ADD_APPLY_FAILED.get(buffer);
        throw new DirectoryException(resultCode, message);
      }
    }
@@ -1303,20 +1288,16 @@
          }
        }

        LocalizableMessage message =
            ERR_CONFIG_FILE_DELETE_NO_SUCH_ENTRY.get(String.valueOf(entryDN));
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
                matchedDN, null);
        LocalizableMessage message = ERR_CONFIG_FILE_DELETE_NO_SUCH_ENTRY.get(entryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message, matchedDN, null);
      }


      // If the entry has children, then fail.
      if (entry.hasChildren())
      {
        LocalizableMessage message =
            ERR_CONFIG_FILE_DELETE_HAS_CHILDREN.get(String.valueOf(entryDN));
        throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_NONLEAF,
                message);
        LocalizableMessage message = ERR_CONFIG_FILE_DELETE_HAS_CHILDREN.get(entryDN);
        throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_NONLEAF, message);
      }


@@ -1325,8 +1306,7 @@
      ConfigEntry parentEntry = entry.getParent();
      if (parentEntry == null)
      {
        LocalizableMessage message =
            ERR_CONFIG_FILE_DELETE_NO_PARENT.get(String.valueOf(entryDN));
        LocalizableMessage message = ERR_CONFIG_FILE_DELETE_NO_PARENT.get(entryDN);
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }

@@ -1341,8 +1321,7 @@
        if (! l.configDeleteIsAcceptable(entry, unacceptableReason))
        {
          LocalizableMessage message = ERR_CONFIG_FILE_DELETE_REJECTED.
              get(String.valueOf(entryDN), String.valueOf(parentEntry.getDN()),
                  String.valueOf(unacceptableReason));
              get(entryDN, parentEntry.getDN(), unacceptableReason);
          throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
                  message);
        }
@@ -1362,10 +1341,8 @@
        logger.traceException(ce);

        LocalizableMessage message = ERR_CONFIG_FILE_DELETE_FAILED.
            get(String.valueOf(entryDN), String.valueOf(parentEntry.getDN()),
                getExceptionMessage(ce));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message);
            get(entryDN, parentEntry.getDN(), getExceptionMessage(ce));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      }


@@ -1404,8 +1381,7 @@
          }
        }

        LocalizableMessage message =
            ERR_CONFIG_FILE_DELETE_APPLY_FAILED.get(String.valueOf(buffer));
        LocalizableMessage message = ERR_CONFIG_FILE_DELETE_APPLY_FAILED.get(buffer);
        throw new DirectoryException(resultCode, message);
      }
    }
@@ -1488,10 +1464,8 @@
          }
        }

        LocalizableMessage message =
            ERR_CONFIG_FILE_MODIFY_NO_SUCH_ENTRY.get(String.valueOf(entryDN));
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message,
                matchedDN, null);
        LocalizableMessage message = ERR_CONFIG_FILE_MODIFY_NO_SUCH_ENTRY.get(entryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message, matchedDN, null);
      }


@@ -1500,8 +1474,7 @@
      if (! currentEntry.getEntry().getStructuralObjectClass().equals(
                 newEntry.getStructuralObjectClass()))
      {
        LocalizableMessage message = ERR_CONFIG_FILE_MODIFY_STRUCTURAL_CHANGE_NOT_ALLOWED.
            get(String.valueOf(entryDN));
        LocalizableMessage message = ERR_CONFIG_FILE_MODIFY_STRUCTURAL_CHANGE_NOT_ALLOWED.get(entryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, message);
      }

@@ -1520,9 +1493,8 @@
        if (! l.configChangeIsAcceptable(newConfigEntry, unacceptableReason))
        {
          LocalizableMessage message = ERR_CONFIG_FILE_MODIFY_REJECTED_BY_CHANGE_LISTENER.
              get(String.valueOf(entryDN), String.valueOf(unacceptableReason));
          throw new DirectoryException(
                  ResultCode.UNWILLING_TO_PERFORM, message);
              get(entryDN, unacceptableReason);
          throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
        }
      }

@@ -1570,8 +1542,7 @@
          }
        }

        LocalizableMessage message =
            ERR_CONFIG_FILE_MODIFY_APPLY_FAILED.get(String.valueOf(buffer));
        LocalizableMessage message = ERR_CONFIG_FILE_MODIFY_APPLY_FAILED.get(buffer);
        throw new DirectoryException(resultCode, message);
      }
    }
@@ -1633,8 +1604,7 @@
    ConfigEntry baseEntry = configEntries.get(baseDN);
    if (baseEntry == null)
    {
      LocalizableMessage message = ERR_CONFIG_FILE_SEARCH_NO_SUCH_BASE.get(
              String.valueOf(baseDN));
      LocalizableMessage message = ERR_CONFIG_FILE_SEARCH_NO_SUCH_BASE.get(baseDN);
      DN matchedDN = null;
      if (baseDN.isDescendantOf(configRootEntry.getDN()))
      {
@@ -1709,8 +1679,7 @@

      default:
        // The user provided an invalid scope.
        LocalizableMessage message =
            ERR_CONFIG_FILE_SEARCH_INVALID_SCOPE.get(String.valueOf(scope));
        LocalizableMessage message = ERR_CONFIG_FILE_SEARCH_INVALID_SCOPE.get(scope);
        throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }
  }
@@ -1844,8 +1813,7 @@
      logger.traceException(e);

      LocalizableMessage message =
          ERR_CONFIG_FILE_WRITE_CANNOT_EXPORT_NEW_CONFIG.get(String
              .valueOf(tempConfig), stackTraceToSingleLineString(e));
          ERR_CONFIG_FILE_WRITE_CANNOT_EXPORT_NEW_CONFIG.get(tempConfig, stackTraceToSingleLineString(e));
      logger.error(message);

      DirectoryServer.sendAlertNotification(this,
@@ -1866,9 +1834,7 @@
      logger.traceException(e);

      LocalizableMessage message =
          ERR_CONFIG_FILE_WRITE_CANNOT_RENAME_NEW_CONFIG.get(String
              .valueOf(tempConfig), String.valueOf(configFile),
              stackTraceToSingleLineString(e));
          ERR_CONFIG_FILE_WRITE_CANNOT_RENAME_NEW_CONFIG.get(tempConfig, configFile, stackTraceToSingleLineString(e));
      logger.error(message);

      DirectoryServer.sendAlertNotification(this,
@@ -2252,9 +2218,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_LDIF_WRITE_ERROR.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
      LocalizableMessage message = ERR_CONFIG_LDIF_WRITE_ERROR.get(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
    }

    try
@@ -2265,9 +2230,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_FILE_CLOSE_ERROR.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
      LocalizableMessage message = ERR_CONFIG_FILE_CLOSE_ERROR.get(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
    }
  }

@@ -2484,10 +2448,8 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_BACKUP_CANNOT_CREATE_ARCHIVE_FILE.
          get(String.valueOf(filename), backupDirectory.getPath(),
              stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
          get(filename, backupDirectory.getPath(), stackTraceToSingleLineString(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
    }


@@ -2957,10 +2919,8 @@
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CONFIG_RESTORE_CANNOT_BACKUP_EXISTING_CONFIG.
            get(backupID, configDirPath, String.valueOf(backupDirPath),
                getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message, e);
            get(backupID, configDirPath, backupDirPath, getExceptionMessage(e));
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
      }


@@ -3277,8 +3237,7 @@
  {
    if (result == null)
    {
      logger.error(ERR_CONFIG_CHANGE_NO_RESULT, String.valueOf(className), String.valueOf(methodName),
              String.valueOf(entryDN));
      logger.error(ERR_CONFIG_CHANGE_NO_RESULT, className, methodName, entryDN);
      return;
    }


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

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

      LocalizableMessage message = ERR_DICTIONARY_VALIDATOR_CANNOT_READ_FILE.get(
          configuration.getDictionaryFile(), String.valueOf(e));
      LocalizableMessage message = ERR_DICTIONARY_VALIDATOR_CANNOT_READ_FILE.get(configuration.getDictionaryFile(), e);
      throw new InitializationException(message);
    }
    finally

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

@@ -126,8 +126,7 @@
                  this);
      } catch (UnknownHostException unhe) {
          logger.traceException(unhe);
          LocalizableMessage message = ERR_SASL_CANNOT_GET_SERVER_FQDN.get(
                  String.valueOf(configEntryDN), getExceptionMessage(unhe));
          LocalizableMessage message = ERR_SASL_CANNOT_GET_SERVER_FQDN.get(configEntryDN, getExceptionMessage(unhe));
          throw new InitializationException(message, unhe);
      }
  }
@@ -256,10 +255,8 @@
      } catch (UnknownHostException unhe) {
          logger.traceException(unhe);
          resultCode = ResultCode.OPERATIONS_ERROR;
          messages.add(ERR_SASL_CANNOT_GET_SERVER_FQDN.get(
                  String.valueOf(configEntryDN), getExceptionMessage(unhe)));
          return new ConfigChangeResult(resultCode,adminActionRequired,
                  messages);
          messages.add(ERR_SASL_CANNOT_GET_SERVER_FQDN.get(configEntryDN, getExceptionMessage(unhe)));
          return new ConfigChangeResult(resultCode,adminActionRequired, messages);
      }
      return new ConfigChangeResult(resultCode, adminActionRequired, messages);
  }

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

@@ -143,11 +143,11 @@
        {
          LocalizableMessage message =
               ERR_DYNAMICGROUP_INTERNAL_SEARCH_FAILED.get(
                       String.valueOf(baseDNs[searchCounter]),
                       String.valueOf(searchFilters[searchCounter]),
                       String.valueOf(memberList.getDynamicGroupDN()),
                       String.valueOf(resultCode),
                       String.valueOf(searchOperation.getErrorMessage()));
                       baseDNs[searchCounter],
                       searchFilters[searchCounter],
                       memberList.getDynamicGroupDN(),
                       resultCode,
                       searchOperation.getErrorMessage());
          if (! memberList.addResult(
                     new MembershipException(message, true)))
          {
@@ -177,10 +177,8 @@
        if (! memberList.addResult(searchEntry))
        {
          LocalizableMessage message = ERR_DYNAMICGROUP_CANNOT_RETURN_ENTRY.
              get(String.valueOf(searchEntry.getName()),
                  String.valueOf(memberList.getDynamicGroupDN()));
          throw new DirectoryException(
                         DirectoryServer.getServerErrorResultCode(), message);
              get(searchEntry.getName(), memberList.getDynamicGroupDN());
          throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
        }

        return;

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

@@ -120,7 +120,7 @@
                   AccountStatusNotification notification)
  {
    logger.info(NOTE_ERRORLOG_ACCTNOTHANDLER_NOTIFICATION.get(notification.getNotificationType().getName(),
                  String.valueOf(notification.getUserDN()),
                  notification.getUserDN(),
                  notification.getMessage().ordinal(),
                  notification.getMessage()));
  }

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

@@ -225,24 +225,20 @@

        case SIZE_LIMIT_EXCEEDED:
          // Multiple entries matched the filter.  This is not acceptable.
          LocalizableMessage message =
              ERR_EXACTMAP_MULTIPLE_MATCHING_ENTRIES.get(String.valueOf(id));
          throw new DirectoryException(
                  ResultCode.CONSTRAINT_VIOLATION, message);
          LocalizableMessage message = ERR_EXACTMAP_MULTIPLE_MATCHING_ENTRIES.get(id);
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);

        case TIME_LIMIT_EXCEEDED:
        case ADMIN_LIMIT_EXCEEDED:
          // The search criteria was too inefficient.
          message = ERR_EXACTMAP_INEFFICIENT_SEARCH.
              get(String.valueOf(id),
                  String.valueOf(internalSearch.getErrorMessage()));
              get(id, internalSearch.getErrorMessage());
          throw new DirectoryException(internalSearch.getResultCode(), message);

        default:
          // Just pass on the failure that was returned for this search.
          message = ERR_EXACTMAP_SEARCH_FAILED.
              get(String.valueOf(id),
                  String.valueOf(internalSearch.getErrorMessage()));
              get(id, internalSearch.getErrorMessage());
          throw new DirectoryException(internalSearch.getResultCode(), message);
      }

@@ -256,18 +252,14 @@
          matchingEntry = iterator.next();
          if (iterator.hasNext())
          {
            LocalizableMessage message =
                ERR_EXACTMAP_MULTIPLE_MATCHING_ENTRIES.get(String.valueOf(id));
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                         message);
            LocalizableMessage message = ERR_EXACTMAP_MULTIPLE_MATCHING_ENTRIES.get(id);
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
          }
        }
        else
        {
          LocalizableMessage message =
              ERR_EXACTMAP_MULTIPLE_MATCHING_ENTRIES.get(String.valueOf(id));
          throw new DirectoryException(
                  ResultCode.CONSTRAINT_VIOLATION, message);
          LocalizableMessage message = ERR_EXACTMAP_MULTIPLE_MATCHING_ENTRIES.get(id);
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
        }
      }
    }

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

@@ -233,8 +233,7 @@
          {
            bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

            LocalizableMessage message = ERR_SASLEXTERNAL_NO_CERT_IN_ENTRY.get(
                    String.valueOf(userEntry.getName()));
            LocalizableMessage message = ERR_SASLEXTERNAL_NO_CERT_IN_ENTRY.get(userEntry.getName());
            bindOperation.setAuthFailureReason(message);
            return;
          }
@@ -262,8 +261,7 @@
            {
              bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

              LocalizableMessage message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(
                      String.valueOf(userEntry.getName()));
              LocalizableMessage message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(userEntry.getName());
              bindOperation.setAuthFailureReason(message);
              return;
            }
@@ -275,8 +273,7 @@
            bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

            LocalizableMessage message = ERR_SASLEXTERNAL_CANNOT_VALIDATE_CERT.get(
                    String.valueOf(userEntry.getName()),
                    getExceptionMessage(e));
                userEntry.getName(), getExceptionMessage(e));
            bindOperation.setAuthFailureReason(message);
            return;
          }
@@ -307,8 +304,7 @@
            {
              bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

              LocalizableMessage message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(
                      String.valueOf(userEntry.getName()));
              LocalizableMessage message = ERR_SASLEXTERNAL_PEER_CERT_NOT_FOUND.get(userEntry.getName());
              bindOperation.setAuthFailureReason(message);
              return;
            }
@@ -320,8 +316,7 @@
            bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

            LocalizableMessage message = ERR_SASLEXTERNAL_CANNOT_VALIDATE_CERT.get(
                    String.valueOf(userEntry.getName()),
                    getExceptionMessage(e));
                    userEntry.getName(), getExceptionMessage(e));
            bindOperation.setAuthFailureReason(message);
            return;
          }

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

@@ -119,15 +119,13 @@
    try {
      File f = getFileForPath(keyStoreFile);
      if (!(f.exists() && f.isFile())) {
        LocalizableMessage message = ERR_FILE_KEYMANAGER_NO_SUCH_FILE.get(
            String.valueOf(keyStoreFile), String.valueOf(configEntryDN));
        throw new InitializationException(message);
        throw new InitializationException(ERR_FILE_KEYMANAGER_NO_SUCH_FILE.get(keyStoreFile, configEntryDN));
      }
    } catch (SecurityException e) {
      logger.traceException(e);

      LocalizableMessage message = ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_FILE.get(
          String.valueOf(configEntryDN), getExceptionMessage(e));
          configEntryDN, getExceptionMessage(e));
      throw new InitializationException(message, e);
    }

@@ -141,8 +139,7 @@
        logger.traceException(kse);

        LocalizableMessage message = ERR_FILE_KEYMANAGER_INVALID_TYPE.
            get(String.valueOf(configuration.getKeyStoreType()),
                String.valueOf(configEntryDN), getExceptionMessage(kse));
            get(configuration.getKeyStoreType(), configEntryDN, getExceptionMessage(kse));
        throw new InitializationException(message);
      }
    } else {
@@ -168,7 +165,7 @@

      if (pinStr == null) {
        LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
            String.valueOf(propertyName), String.valueOf(configEntryDN));
            propertyName, configEntryDN);
        throw new InitializationException(message);
      }

@@ -180,7 +177,7 @@

      if (pinStr == null) {
        LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
            String.valueOf(enVarName), String.valueOf(configEntryDN));
            enVarName, configEntryDN);
        throw new InitializationException(message);
      }

@@ -191,7 +188,7 @@

      if (!pinFile.exists()) {
        LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_NO_SUCH_FILE.get(
            String.valueOf(fileName), String.valueOf(configEntryDN));
            fileName, configEntryDN);
        throw new InitializationException(message);
      }

@@ -203,14 +200,12 @@
        br.close();
      } catch (IOException ioe) {
        LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ.
            get(String.valueOf(fileName), String.valueOf(configEntryDN),
                getExceptionMessage(ioe));
            get(fileName, configEntryDN, getExceptionMessage(ioe));
        throw new InitializationException(message, ioe);
      }

      if (pinStr == null) {
        LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY.get(
            String.valueOf(fileName), String.valueOf(configEntryDN));
        LocalizableMessage message = ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY.get(fileName, configEntryDN);
        throw new InitializationException(message);
      }

@@ -319,9 +314,7 @@
      File f = getFileForPath(newKeyStoreFile);
      if (!(f.exists() && f.isFile()))
      {
        unacceptableReasons.add(ERR_FILE_KEYMANAGER_NO_SUCH_FILE.get(
                String.valueOf(newKeyStoreFile),
                String.valueOf(cfgEntryDN)));
        unacceptableReasons.add(ERR_FILE_KEYMANAGER_NO_SUCH_FILE.get(newKeyStoreFile, cfgEntryDN));
        configAcceptable = false;
      }
    }
@@ -329,9 +322,7 @@
    {
      logger.traceException(e);

      unacceptableReasons.add(ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_FILE.get(
              String.valueOf(cfgEntryDN),
              getExceptionMessage(e)));
      unacceptableReasons.add(ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_FILE.get(cfgEntryDN, getExceptionMessage(e)));
      configAcceptable = false;
    }

@@ -347,8 +338,7 @@
        logger.traceException(kse);

        unacceptableReasons.add(ERR_FILE_KEYMANAGER_INVALID_TYPE.get(
                String.valueOf(configuration.getKeyStoreType()),
               String.valueOf(cfgEntryDN), getExceptionMessage(kse)));
            configuration.getKeyStoreType(), cfgEntryDN, getExceptionMessage(kse)));
        configAcceptable = false;
      }
    }
@@ -372,9 +362,7 @@

      if (pinStr == null)
      {
        unacceptableReasons.add(ERR_FILE_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
                String.valueOf(propertyName),
                String.valueOf(cfgEntryDN)));
        unacceptableReasons.add(ERR_FILE_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(propertyName, cfgEntryDN));
        configAcceptable = false;
      }
    }
@@ -385,9 +373,7 @@

      if (pinStr == null)
      {
        unacceptableReasons.add(ERR_FILE_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
                String.valueOf(enVarName),
                String.valueOf(cfgEntryDN)));
        unacceptableReasons.add(ERR_FILE_KEYMANAGER_PIN_ENVAR_NOT_SET.get(enVarName, cfgEntryDN));
        configAcceptable = false;
      }
    }
@@ -398,9 +384,7 @@

      if (!pinFile.exists())
      {
        unacceptableReasons.add(ERR_FILE_KEYMANAGER_PIN_NO_SUCH_FILE.get(
                String.valueOf(fileName),
                String.valueOf(cfgEntryDN)));
        unacceptableReasons.add(ERR_FILE_KEYMANAGER_PIN_NO_SUCH_FILE.get(fileName, cfgEntryDN));
        configAcceptable = false;
      }
      else
@@ -414,9 +398,7 @@
        catch (IOException ioe)
        {
          unacceptableReasons.add(ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ.get(
                  String.valueOf(fileName),
                  String.valueOf(cfgEntryDN),
                  getExceptionMessage(ioe)));
              fileName, cfgEntryDN, getExceptionMessage(ioe)));
          configAcceptable = false;
        }
        finally
@@ -429,9 +411,7 @@

        if (pinStr == null)
        {
          unacceptableReasons.add(ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY.get(
                  String.valueOf(fileName),
                  String.valueOf(cfgEntryDN)));
          unacceptableReasons.add(ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY.get(fileName, cfgEntryDN));
          configAcceptable = false;
        }
      }
@@ -441,10 +421,7 @@
      String pinStr = configuration.getKeyStorePin();
      if (pinStr == null)
      {
        unacceptableReasons.add(
            ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR.get(
              String.valueOf(cfgEntryDN),
              "null"));
        unacceptableReasons.add(ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR.get(cfgEntryDN, null));
        configAcceptable = false;
      }
    }
@@ -475,8 +452,7 @@
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_FILE_KEYMANAGER_NO_SUCH_FILE.get(
                String.valueOf(newKeyStoreFile),
                String.valueOf(configEntryDN)));
            newKeyStoreFile, configEntryDN));
      }
    }
    catch (Exception e)
@@ -486,8 +462,7 @@
      resultCode = DirectoryServer.getServerErrorResultCode();

      messages.add(ERR_FILE_KEYMANAGER_CANNOT_DETERMINE_FILE.get(
              String.valueOf(configEntryDN),
              getExceptionMessage(e)));
          configEntryDN, getExceptionMessage(e)));
    }

    // Get the keystore type. If none is specified, then use the default type.
@@ -506,9 +481,7 @@
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_FILE_KEYMANAGER_INVALID_TYPE.get(
                String.valueOf(configuration.getKeyStoreType()),
                String.valueOf(configEntryDN),
                getExceptionMessage(kse)));
            configuration.getKeyStoreType(), configEntryDN, getExceptionMessage(kse)));
      }
    }

@@ -535,8 +508,7 @@
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_FILE_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
                String.valueOf(propertyName),
                String.valueOf(configEntryDN)));
            propertyName, configEntryDN));
      }
      else
      {
@@ -553,8 +525,7 @@
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_FILE_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
                String.valueOf(enVarName),
                String.valueOf(configEntryDN)));
            enVarName, configEntryDN));
      }
      else
      {
@@ -571,8 +542,7 @@
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_FILE_KEYMANAGER_PIN_NO_SUCH_FILE.get(
                String.valueOf(fileName),
                String.valueOf(configEntryDN)));
            fileName, configEntryDN));
      }
      else
      {
@@ -587,9 +557,7 @@
          resultCode = DirectoryServer.getServerErrorResultCode();

          messages.add(ERR_FILE_KEYMANAGER_PIN_FILE_CANNOT_READ.get(
                  String.valueOf(fileName),
                  String.valueOf(configEntryDN),
                  getExceptionMessage(ioe)));
              fileName, configEntryDN, getExceptionMessage(ioe)));
        }
        finally
        {
@@ -604,8 +572,7 @@
          resultCode = DirectoryServer.getServerErrorResultCode();

          messages.add(ERR_FILE_KEYMANAGER_PIN_FILE_EMPTY.get(
                  String.valueOf(fileName),
                  String.valueOf(configEntryDN)));
              fileName, configEntryDN));
        }
        else
        {

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

@@ -123,8 +123,7 @@
    File f = getFileForPath(trustStoreFile);
    if (! (f.exists() && f.isFile()))
    {
      LocalizableMessage message = ERR_FILE_TRUSTMANAGER_NO_SUCH_FILE.get(
          String.valueOf(trustStoreFile), String.valueOf(configEntryDN));
      LocalizableMessage message = ERR_FILE_TRUSTMANAGER_NO_SUCH_FILE.get(trustStoreFile, configEntryDN);
      throw new InitializationException(message);
    }

@@ -146,8 +145,7 @@
      logger.traceException(kse);

      LocalizableMessage message = ERR_FILE_TRUSTMANAGER_INVALID_TYPE.
          get(String.valueOf(trustStoreType), String.valueOf(configEntryDN),
              getExceptionMessage(kse));
          get(trustStoreType, configEntryDN, getExceptionMessage(kse));
      throw new InitializationException(message);
    }

@@ -186,8 +184,7 @@
          File pinFile = getFileForPath(pinFilePath);
          if (! pinFile.exists())
          {
            LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_NO_SUCH_FILE.get(
                String.valueOf(pinFilePath), String.valueOf(configEntryDN));
            LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_NO_SUCH_FILE.get(pinFilePath, configEntryDN);
            throw new InitializationException(message);
          }
          else
@@ -203,8 +200,7 @@
            catch (IOException ioe)
            {
              LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_FILE_CANNOT_READ.
                  get(String.valueOf(pinFilePath),
                      String.valueOf(configEntryDN), getExceptionMessage(ioe));
                  get(pinFilePath, configEntryDN, getExceptionMessage(ioe));
              throw new InitializationException(message, ioe);
            }
            finally
@@ -217,8 +213,7 @@

            if (pinStr == null)
            {
              LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_FILE_EMPTY.get(
                  String.valueOf(pinFilePath), String.valueOf(configEntryDN));
              LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_FILE_EMPTY.get(pinFilePath, configEntryDN);
              throw new InitializationException(message);
            }
            else
@@ -233,8 +228,7 @@
        String pinStr = System.getenv(pinEnVar);
        if (pinStr == null)
        {
          LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_ENVAR_NOT_SET.get(
              String.valueOf(pinProperty), String.valueOf(configEntryDN));
          LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_ENVAR_NOT_SET.get(pinProperty, configEntryDN);
          throw new InitializationException(message);
        }
        else
@@ -248,8 +242,7 @@
      String pinStr = System.getProperty(pinProperty);
      if (pinStr == null)
      {
        LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_PROPERTY_NOT_SET.get(
            String.valueOf(pinProperty), String.valueOf(configEntryDN));
        LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_PROPERTY_NOT_SET.get(pinProperty, configEntryDN);
        throw new InitializationException(message);
      }
      else
@@ -361,9 +354,7 @@
      File f = getFileForPath(newTrustStoreFile);
      if (!(f.exists() && f.isFile()))
      {
        unacceptableReasons.add(ERR_FILE_TRUSTMANAGER_NO_SUCH_FILE.get(
                String.valueOf(newTrustStoreFile),
                String.valueOf(cfgEntryDN)));
        unacceptableReasons.add(ERR_FILE_TRUSTMANAGER_NO_SUCH_FILE.get(newTrustStoreFile, cfgEntryDN));
        configAcceptable = false;
      }
    }
@@ -371,9 +362,7 @@
    {
      logger.traceException(e);

      unacceptableReasons.add(ERR_FILE_TRUSTMANAGER_CANNOT_DETERMINE_FILE.get(
              String.valueOf(cfgEntryDN),
              getExceptionMessage(e)));
      unacceptableReasons.add(ERR_FILE_TRUSTMANAGER_CANNOT_DETERMINE_FILE.get(cfgEntryDN, getExceptionMessage(e)));
      configAcceptable = false;
    }

@@ -390,11 +379,8 @@
      {
        logger.traceException(kse);

        LocalizableMessage message = ERR_FILE_TRUSTMANAGER_INVALID_TYPE.get(
                String.valueOf(storeType),
                String.valueOf(cfgEntryDN),
                getExceptionMessage(kse));
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_FILE_TRUSTMANAGER_INVALID_TYPE.get(
            storeType, cfgEntryDN, getExceptionMessage(kse)));
        configAcceptable = false;
      }
    }
@@ -407,9 +393,7 @@
    {
      if (System.getProperty(pinProp) == null)
      {
        LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_PROPERTY_NOT_SET.get(
                String.valueOf(pinProp),
                String.valueOf(cfgEntryDN));
        LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_PROPERTY_NOT_SET.get(pinProp, cfgEntryDN);
        unacceptableReasons.add(message);
        configAcceptable = false;
      }
@@ -423,9 +407,7 @@
    {
      if (System.getenv(pinEnVar) == null)
      {
        LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_ENVAR_NOT_SET.get(
                String.valueOf(pinEnVar),
                String.valueOf(cfgEntryDN));
        LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_ENVAR_NOT_SET.get(pinEnVar, cfgEntryDN);
        unacceptableReasons.add(message);
        configAcceptable = false;
      }
@@ -449,11 +431,8 @@
        }
        catch (IOException ioe)
        {
          LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_FILE_CANNOT_READ.get(
                  String.valueOf(pinFile),
                  String.valueOf(cfgEntryDN),
                  getExceptionMessage(ioe));
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_FILE_TRUSTMANAGER_PIN_FILE_CANNOT_READ.get(
              pinFile, cfgEntryDN, getExceptionMessage(ioe)));
          configAcceptable = false;
        }
        finally
@@ -466,18 +445,14 @@

        if (pinStr == null)
        {
          LocalizableMessage message =  ERR_FILE_TRUSTMANAGER_PIN_FILE_EMPTY.get(
                  String.valueOf(pinFile),
                  String.valueOf(cfgEntryDN));
          LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_FILE_EMPTY.get(pinFile, cfgEntryDN);
          unacceptableReasons.add(message);
          configAcceptable = false;
        }
      }
      else
      {
        LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_NO_SUCH_FILE.get(
                String.valueOf(pinFile),
                String.valueOf(cfgEntryDN));
        LocalizableMessage message = ERR_FILE_TRUSTMANAGER_PIN_NO_SUCH_FILE.get(pinFile, cfgEntryDN);
        unacceptableReasons.add(message);
        configAcceptable = false;
      }
@@ -505,9 +480,7 @@
    {
      resultCode = DirectoryServer.getServerErrorResultCode();

      messages.add(ERR_FILE_TRUSTMANAGER_NO_SUCH_FILE.get(
              String.valueOf(newTrustStoreFile),
              String.valueOf(configEntryDN)));
      messages.add(ERR_FILE_TRUSTMANAGER_NO_SUCH_FILE.get(newTrustStoreFile, configEntryDN));
    }


@@ -527,11 +500,7 @@
    {
      logger.traceException(kse);

      messages.add(ERR_FILE_TRUSTMANAGER_INVALID_TYPE.get(
              String.valueOf(newTrustStoreType),
              String.valueOf(configEntryDN),
              getExceptionMessage(kse)));

      messages.add(ERR_FILE_TRUSTMANAGER_INVALID_TYPE.get(newTrustStoreType, configEntryDN, getExceptionMessage(kse)));
      resultCode = DirectoryServer.getServerErrorResultCode();
    }

@@ -573,9 +542,7 @@
          {
            resultCode = DirectoryServer.getServerErrorResultCode();

            messages.add(ERR_FILE_TRUSTMANAGER_PIN_NO_SUCH_FILE.get(
                    String.valueOf(newPINFile),
                    String.valueOf(configEntryDN)));
            messages.add(ERR_FILE_TRUSTMANAGER_PIN_NO_SUCH_FILE.get(newPINFile, configEntryDN));
          }
          else
          {
@@ -590,11 +557,8 @@
            catch (IOException ioe)
            {
              resultCode = DirectoryServer.getServerErrorResultCode();

              messages.add(ERR_FILE_TRUSTMANAGER_PIN_FILE_CANNOT_READ.get(
                      String.valueOf(newPINFile),
                      String.valueOf(configEntryDN),
                      getExceptionMessage(ioe)));
                  newPINFile, configEntryDN, getExceptionMessage(ioe)));
            }
            finally
            {
@@ -608,9 +572,7 @@
            {
              resultCode = DirectoryServer.getServerErrorResultCode();

              messages.add(ERR_FILE_TRUSTMANAGER_PIN_FILE_EMPTY.get(
                      String.valueOf(newPINFile),
                      String.valueOf(configEntryDN)));
              messages.add(ERR_FILE_TRUSTMANAGER_PIN_FILE_EMPTY.get(newPINFile, configEntryDN));
            }
            else
            {
@@ -626,9 +588,7 @@
        {
          resultCode = DirectoryServer.getServerErrorResultCode();

          messages.add(ERR_FILE_TRUSTMANAGER_PIN_ENVAR_NOT_SET.get(
                  String.valueOf(newPINEnVar),
                  String.valueOf(configEntryDN)));
          messages.add(ERR_FILE_TRUSTMANAGER_PIN_ENVAR_NOT_SET.get(newPINEnVar, configEntryDN));
        }
        else
        {
@@ -643,9 +603,7 @@
      {
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_FILE_TRUSTMANAGER_PIN_PROPERTY_NOT_SET.get(
                String.valueOf(newPINProperty),
                String.valueOf(configEntryDN)));
        messages.add(ERR_FILE_TRUSTMANAGER_PIN_PROPERTY_NOT_SET.get(newPINProperty, configEntryDN));
      }
      else
      {

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

@@ -159,8 +159,7 @@
        logger.traceException(de);

        LocalizableMessage message = ERR_STATICMEMBERS_CANNOT_DECODE_DN.
            get(String.valueOf(nextDN), String.valueOf(groupDN),
                String.valueOf(de.getMessageObject()));
            get(nextDN, groupDN, de.getMessageObject());
        nextMembershipException =
             new MembershipException(message, true, de);
        return;
@@ -210,8 +209,7 @@
        Entry memberEntry = DirectoryConfig.getEntry(nextDN);
        if (memberEntry == null)
        {
          LocalizableMessage message = ERR_STATICMEMBERS_NO_SUCH_ENTRY.get(
              String.valueOf(nextDN), String.valueOf(groupDN));
          LocalizableMessage message = ERR_STATICMEMBERS_NO_SUCH_ENTRY.get(nextDN, groupDN);
          nextMembershipException =
               new MembershipException(message, true);
          return;
@@ -240,8 +238,7 @@
        logger.traceException(de);

        LocalizableMessage message = ERR_STATICMEMBERS_CANNOT_GET_ENTRY.
            get(String.valueOf(nextDN), String.valueOf(groupDN),
                String.valueOf(de.getMessageObject()));
            get(nextDN, groupDN, de.getMessageObject());
        nextMembershipException =
             new MembershipException(message, true, de);
        return;

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

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

      LocalizableMessage message = ERR_FCM_PEER_CERT_NOT_X509.get(
          String.valueOf(certificateChain[0].getType()));
          certificateChain[0].getType());
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
    }

@@ -263,17 +263,13 @@
        case TIME_LIMIT_EXCEEDED:
        case ADMIN_LIMIT_EXCEEDED:
          // The search criteria was too inefficient.
          message = ERR_FCM_INEFFICIENT_SEARCH.get(
                         fingerprintString,
                         String.valueOf(searchOperation.getErrorMessage()));
          message = ERR_FCM_INEFFICIENT_SEARCH.get(fingerprintString, searchOperation.getErrorMessage());
          throw new DirectoryException(searchOperation.getResultCode(),
              message);

        default:
          // Just pass on the failure that was returned for this search.
          message = ERR_FCM_SEARCH_FAILED.get(
                         fingerprintString,
                         String.valueOf(searchOperation.getErrorMessage()));
          message = ERR_FCM_SEARCH_FAILED.get(fingerprintString, searchOperation.getErrorMessage());
          throw new DirectoryException(searchOperation.getResultCode(),
              message);
      }
@@ -287,8 +283,7 @@
        else
        {
          LocalizableMessage message = ERR_FCM_MULTIPLE_MATCHING_ENTRIES.
              get(fingerprintString, String.valueOf(userEntry.getName()),
                  String.valueOf(entry.getName()));
              get(fingerprintString, userEntry.getName(), entry.getName());
          throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
        }
      }

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

@@ -136,8 +136,7 @@
    catch (UnknownHostException unhe)
    {
      logger.traceException(unhe);
      LocalizableMessage message = ERR_SASL_CANNOT_GET_SERVER_FQDN.get(String
          .valueOf(configEntryDN), getExceptionMessage(unhe));
      LocalizableMessage message = ERR_SASL_CANNOT_GET_SERVER_FQDN.get(configEntryDN, getExceptionMessage(unhe));
      throw new InitializationException(message, unhe);
    }
    catch (IOException ioe)

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

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

        LocalizableMessage message =
            ERR_JMX_ALERT_HANDLER_CANNOT_REGISTER.get(String.valueOf(e));
        LocalizableMessage message = ERR_JMX_ALERT_HANDLER_CANNOT_REGISTER.get(e);
        throw new InitializationException(message, e);
      }
    }
@@ -269,8 +268,7 @@
         throws AttributeNotFoundException
  {
    // There are no attributes for this MBean.
    LocalizableMessage message = ERR_CONFIG_JMX_ATTR_NO_ATTR.get(
        String.valueOf(configEntryDN), attribute);
    LocalizableMessage message = ERR_CONFIG_JMX_ATTR_NO_ATTR.get(configEntryDN, attribute);
    throw new AttributeNotFoundException(message.toString());
  }

@@ -292,8 +290,7 @@
         throws AttributeNotFoundException, InvalidAttributeValueException
  {
    // There are no attributes for this MBean.
    LocalizableMessage message = ERR_CONFIG_JMX_ATTR_NO_ATTR.get(
        String.valueOf(configEntryDN), String.valueOf(attribute));
    LocalizableMessage message = ERR_CONFIG_JMX_ATTR_NO_ATTR.get(configEntryDN, attribute);
    throw new AttributeNotFoundException(message.toString());
  }


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

@@ -1003,16 +1003,13 @@
              // Multiple matching candidates.
              throw new DirectoryException(
                  ResultCode.CLIENT_SIDE_MORE_RESULTS_TO_RETURN,
                  ERR_LDAP_PTA_CONNECTION_SEARCH_SIZE_LIMIT.get(host, port,
                      String.valueOf(cfg.dn()), String.valueOf(baseDN),
                      String.valueOf(filter)));
                  ERR_LDAP_PTA_CONNECTION_SEARCH_SIZE_LIMIT.get(host, port, cfg.dn(), baseDN, filter));

            default:
              // The search failed for some reason.
              throw new DirectoryException(resultCode,
                  ERR_LDAP_PTA_CONNECTION_SEARCH_FAILED.get(host, port,
                      String.valueOf(cfg.dn()), String.valueOf(baseDN),
                      String.valueOf(filter), resultCode.getIntValue(),
                      cfg.dn(), baseDN, filter, resultCode.getIntValue(),
                      resultCode.getResultCodeName(),
                      searchResult.getErrorMessage()));
            }
@@ -1033,8 +1030,7 @@
          throw new DirectoryException(
              ResultCode.CLIENT_SIDE_MORE_RESULTS_TO_RETURN,
              ERR_LDAP_PTA_CONNECTION_SEARCH_SIZE_LIMIT.get(host, port,
                  String.valueOf(cfg.dn()), String.valueOf(baseDN),
                  String.valueOf(filter)));
                  cfg.dn(), baseDN, filter));
        }

        if (username == null)
@@ -1043,8 +1039,7 @@
          throw new DirectoryException(
              ResultCode.CLIENT_SIDE_NO_RESULTS_RETURNED,
              ERR_LDAP_PTA_CONNECTION_SEARCH_NO_MATCHES.get(host, port,
                  String.valueOf(cfg.dn()), String.valueOf(baseDN),
                  String.valueOf(filter)));
                  cfg.dn(), baseDN, filter));
        }

        return username;
@@ -1085,7 +1080,7 @@
            // The bind failed for some reason.
            throw new DirectoryException(resultCode,
                ERR_LDAP_PTA_CONNECTION_BIND_FAILED.get(host, port,
                    String.valueOf(cfg.dn()), String.valueOf(username),
                    cfg.dn(), username,
                    resultCode.getIntValue(), resultCode.getResultCodeName(),
                    bindResponse.getErrorMessage()));
          }
@@ -1141,7 +1136,7 @@

            throw new DirectoryException(mappedResultCode,
                ERR_LDAP_PTA_CONNECTION_DISCONNECTING.get(host, port,
                    String.valueOf(cfg.dn()), resultCode.getIntValue(),
                    cfg.dn(), resultCode.getIntValue(),
                    resultCode.getResultCodeName(),
                    extendedResponse.getErrorMessage()));
          }
@@ -1150,8 +1145,7 @@
        // Unexpected response type.
        throw new DirectoryException(ResultCode.CLIENT_SIDE_DECODING_ERROR,
            ERR_LDAP_PTA_CONNECTION_WRONG_RESPONSE.get(host, port,
                String.valueOf(cfg.dn()),
                String.valueOf(responseMessage.getProtocolOp())));
                cfg.dn(), responseMessage.getProtocolOp()));
      }


@@ -1170,46 +1164,40 @@
          if (e.getCause() instanceof SocketTimeoutException)
          {
            throw new DirectoryException(ResultCode.CLIENT_SIDE_TIMEOUT,
                ERR_LDAP_PTA_CONNECTION_TIMEOUT.get(host, port,
                    String.valueOf(cfg.dn())), e);
                ERR_LDAP_PTA_CONNECTION_TIMEOUT.get(host, port, cfg.dn()), e);
          }
          else if (e.getCause() instanceof IOException)
          {
            throw new DirectoryException(ResultCode.CLIENT_SIDE_SERVER_DOWN,
                ERR_LDAP_PTA_CONNECTION_OTHER_ERROR.get(host, port,
                    String.valueOf(cfg.dn()), e.getMessage()), e);
                ERR_LDAP_PTA_CONNECTION_OTHER_ERROR.get(host, port, cfg.dn(), e.getMessage()), e);
          }
          else
          {
            throw new DirectoryException(ResultCode.CLIENT_SIDE_DECODING_ERROR,
                ERR_LDAP_PTA_CONNECTION_DECODE_ERROR.get(host, port,
                    String.valueOf(cfg.dn()), e.getMessage()), e);
                ERR_LDAP_PTA_CONNECTION_DECODE_ERROR.get(host, port, cfg.dn(), e.getMessage()), e);
          }
        }
        catch (final LDAPException e)
        {
          throw new DirectoryException(ResultCode.CLIENT_SIDE_DECODING_ERROR,
              ERR_LDAP_PTA_CONNECTION_DECODE_ERROR.get(host, port,
                  String.valueOf(cfg.dn()), e.getMessage()), e);
                  cfg.dn(), e.getMessage()), e);
        }
        catch (final SocketTimeoutException e)
        {
          throw new DirectoryException(ResultCode.CLIENT_SIDE_TIMEOUT,
              ERR_LDAP_PTA_CONNECTION_TIMEOUT.get(host, port,
                  String.valueOf(cfg.dn())), e);
              ERR_LDAP_PTA_CONNECTION_TIMEOUT.get(host, port, cfg.dn()), e);
        }
        catch (final IOException e)
        {
          throw new DirectoryException(ResultCode.CLIENT_SIDE_SERVER_DOWN,
              ERR_LDAP_PTA_CONNECTION_OTHER_ERROR.get(host, port,
                  String.valueOf(cfg.dn()), e.getMessage()), e);
              ERR_LDAP_PTA_CONNECTION_OTHER_ERROR.get(host, port, cfg.dn(), e.getMessage()), e);
        }

        if (responseMessage == null)
        {
          throw new DirectoryException(ResultCode.CLIENT_SIDE_SERVER_DOWN,
              ERR_LDAP_PTA_CONNECTION_CLOSED.get(host, port,
                  String.valueOf(cfg.dn())));
              ERR_LDAP_PTA_CONNECTION_CLOSED.get(host, port, cfg.dn()));
        }
        return responseMessage;
      }
@@ -1229,8 +1217,7 @@
        catch (final IOException e)
        {
          throw new DirectoryException(ResultCode.CLIENT_SIDE_SERVER_DOWN,
              ERR_LDAP_PTA_CONNECTION_OTHER_ERROR.get(host, port,
                  String.valueOf(cfg.dn()), e.getMessage()), e);
              ERR_LDAP_PTA_CONNECTION_OTHER_ERROR.get(host, port, cfg.dn(), e.getMessage()), e);
        }
      }
    }
@@ -1411,38 +1398,32 @@
      {
        logger.traceException(e);
        throw new DirectoryException(ResultCode.CLIENT_SIDE_CONNECT_ERROR,
            ERR_LDAP_PTA_CONNECT_UNKNOWN_HOST.get(host, port,
                String.valueOf(cfg.dn()), host), e);
            ERR_LDAP_PTA_CONNECT_UNKNOWN_HOST.get(host, port, cfg.dn(), host), e);
      }
      catch (final ConnectException e)
      {
        logger.traceException(e);
        throw new DirectoryException(ResultCode.CLIENT_SIDE_CONNECT_ERROR,
            ERR_LDAP_PTA_CONNECT_ERROR.get(host, port,
                String.valueOf(cfg.dn()), port), e);
            ERR_LDAP_PTA_CONNECT_ERROR.get(host, port, cfg.dn(), port), e);
      }
      catch (final SocketTimeoutException e)
      {
        logger.traceException(e);
        throw new DirectoryException(ResultCode.CLIENT_SIDE_TIMEOUT,
            ERR_LDAP_PTA_CONNECT_TIMEOUT.get(host, port,
                String.valueOf(cfg.dn())), e);
            ERR_LDAP_PTA_CONNECT_TIMEOUT.get(host, port, cfg.dn()), e);
      }
      catch (final SSLException e)
      {
        logger.traceException(e);
        throw new DirectoryException(ResultCode.CLIENT_SIDE_CONNECT_ERROR,
            ERR_LDAP_PTA_CONNECT_SSL_ERROR.get(host, port,
                String.valueOf(cfg.dn()), e.getMessage()), e);
            ERR_LDAP_PTA_CONNECT_SSL_ERROR.get(host, port, cfg.dn(), e.getMessage()), e);
      }
      catch (final Exception e)
      {
        logger.traceException(e);
        throw new DirectoryException(ResultCode.CLIENT_SIDE_CONNECT_ERROR,
            ERR_LDAP_PTA_CONNECT_OTHER_ERROR.get(host, port,
                String.valueOf(cfg.dn()), e.getMessage()), e);
            ERR_LDAP_PTA_CONNECT_OTHER_ERROR.get(host, port, cfg.dn(), e.getMessage()), e);
      }

    }
  }

@@ -1725,8 +1706,7 @@
               */
              throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
                  ERR_LDAP_PTA_MAPPING_ATTRIBUTE_NOT_FOUND.get(
                      String.valueOf(userEntry.getName()),
                      String.valueOf(cfg.dn()),
                      userEntry.getName(), cfg.dn(),
                      mappedAttributesAsString(cfg.getMappedAttribute())));
            }

@@ -1764,8 +1744,7 @@
               */
              throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
                  ERR_LDAP_PTA_MAPPING_ATTRIBUTE_NOT_FOUND.get(
                      String.valueOf(userEntry.getName()),
                      String.valueOf(cfg.dn()),
                      userEntry.getName(), cfg.dn(),
                      mappedAttributesAsString(cfg.getMappedAttribute())));
            }

@@ -1802,17 +1781,14 @@
                  // More than one matching entry was returned.
                  throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
                      ERR_LDAP_PTA_MAPPED_SEARCH_TOO_MANY_CANDIDATES.get(
                          String.valueOf(userEntry.getName()),
                          String.valueOf(cfg.dn()), String.valueOf(baseDN),
                          String.valueOf(filter)));
                          userEntry.getName(), cfg.dn(), baseDN, filter));
                default:
                  // We don't want to propagate this internal error to the
                  // client. We should log it and map it to a more appropriate
                  // error.
                  throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
                      ERR_LDAP_PTA_MAPPED_SEARCH_FAILED.get(
                          String.valueOf(userEntry.getName()),
                          String.valueOf(cfg.dn()), e.getMessageObject()), e);
                          userEntry.getName(), cfg.dn(), e.getMessageObject()), e);
                }
              }
              finally
@@ -1831,8 +1807,7 @@
               */
              throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
                  ERR_LDAP_PTA_MAPPED_SEARCH_NO_CANDIDATES.get(
                      String.valueOf(userEntry.getName()),
                      String.valueOf(cfg.dn()), String.valueOf(filter)));
                      userEntry.getName(), cfg.dn(), filter));
            }

            break;
@@ -1864,8 +1839,7 @@
              // error.
              throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
                  ERR_LDAP_PTA_MAPPED_BIND_FAILED.get(
                      String.valueOf(userEntry.getName()),
                      String.valueOf(cfg.dn()), e.getMessageObject()), e);
                      userEntry.getName(), cfg.dn(), e.getMessageObject()), e);
            }
          }
          finally
@@ -2351,8 +2325,7 @@
      password = System.getProperty(propertyName);
      if (password == null)
      {
        unacceptableReasons.add(ERR_LDAP_PTA_PWD_PROPERTY_NOT_SET.get(
            String.valueOf(cfg.dn()), String.valueOf(propertyName)));
        unacceptableReasons.add(ERR_LDAP_PTA_PWD_PROPERTY_NOT_SET.get(cfg.dn(), propertyName));
      }
    }
    else if (cfg.getMappedSearchBindPasswordEnvironmentVariable() != null)
@@ -2361,8 +2334,7 @@
      password = System.getenv(envVarName);
      if (password == null)
      {
        unacceptableReasons.add(ERR_LDAP_PTA_PWD_ENVAR_NOT_SET.get(
            String.valueOf(cfg.dn()), String.valueOf(envVarName)));
        unacceptableReasons.add(ERR_LDAP_PTA_PWD_ENVAR_NOT_SET.get(cfg.dn(), envVarName));
      }
    }
    else if (cfg.getMappedSearchBindPasswordFile() != null)
@@ -2371,8 +2343,7 @@
      File passwordFile = getFileForPath(fileName);
      if (!passwordFile.exists())
      {
        unacceptableReasons.add(ERR_LDAP_PTA_PWD_NO_SUCH_FILE.get(
            String.valueOf(cfg.dn()), String.valueOf(fileName)));
        unacceptableReasons.add(ERR_LDAP_PTA_PWD_NO_SUCH_FILE.get(cfg.dn(), fileName));
      }
      else
      {
@@ -2383,15 +2354,13 @@
          password = br.readLine();
          if (password == null)
          {
            unacceptableReasons.add(ERR_LDAP_PTA_PWD_FILE_EMPTY.get(
                String.valueOf(cfg.dn()), String.valueOf(fileName)));
            unacceptableReasons.add(ERR_LDAP_PTA_PWD_FILE_EMPTY.get(cfg.dn(), fileName));
          }
        }
        catch (IOException e)
        {
          unacceptableReasons.add(ERR_LDAP_PTA_PWD_FILE_CANNOT_READ.get(
              String.valueOf(cfg.dn()), String.valueOf(fileName),
              getExceptionMessage(e)));
              cfg.dn(), fileName, getExceptionMessage(e)));
        }
        finally
        {
@@ -2413,8 +2382,7 @@
    else
    {
      // Password wasn't defined anywhere.
      unacceptableReasons
          .add(ERR_LDAP_PTA_NO_PWD.get(String.valueOf(cfg.dn())));
      unacceptableReasons.add(ERR_LDAP_PTA_NO_PWD.get(cfg.dn()));
    }

    return password;
@@ -2436,9 +2404,7 @@
    {
      if (unacceptableReasons != null)
      {
        final LocalizableMessage msg = ERR_LDAP_PTA_INVALID_PORT_NUMBER.get(
            String.valueOf(configuration.dn()), hostPort);
        unacceptableReasons.add(msg);
        unacceptableReasons.add(ERR_LDAP_PTA_INVALID_PORT_NUMBER.get(configuration.dn(), hostPort));
      }
      return false;
    }

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

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

      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(
          MESSAGE_DIGEST_ALGORITHM_MD5, String.valueOf(e));
          MESSAGE_DIGEST_ALGORITHM_MD5, e);
      throw new InitializationException(message, e);
    }

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

      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword, String.valueOf(e)));

      logger.error(ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(storedPassword, e));
      return false;
    }


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

@@ -49,6 +49,7 @@
import org.opends.server.types.DN;
import org.opends.server.types.InitializationException;
import org.opends.server.types.ResultCode;
import org.opends.server.util.StaticUtils;

import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ExtensionMessages.*;
@@ -132,7 +133,7 @@

      if (pinStr == null) {
        LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
            String.valueOf(propertyName), String.valueOf(configEntryDN));
            propertyName, configEntryDN);
        throw new InitializationException(message);
      }

@@ -144,7 +145,7 @@

      if (pinStr == null) {
        LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
            String.valueOf(enVarName), String.valueOf(configEntryDN));
            enVarName, configEntryDN);
        throw new InitializationException(message);
      }

@@ -154,8 +155,7 @@
      File pinFile = getFileForPath(fileName);

      if (!pinFile.exists()) {
        LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
            String.valueOf(fileName), String.valueOf(configEntryDN));
        LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(fileName, configEntryDN);
        throw new InitializationException(message);
      }

@@ -169,14 +169,12 @@
        logger.traceException(ioe);

        LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.
            get(String.valueOf(fileName), String.valueOf(configEntryDN),
                getExceptionMessage(ioe));
            get(fileName, configEntryDN, getExceptionMessage(ioe));
        throw new InitializationException(message, ioe);
      }

      if (pinStr == null) {
        LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
            String.valueOf(fileName), String.valueOf(configEntryDN));
        LocalizableMessage message = ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(fileName, configEntryDN);
        throw new InitializationException(message);
      }

@@ -294,9 +292,7 @@

      if (pinStr == null)
      {
        unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
                String.valueOf(propertyName),
                String.valueOf(cfgEntryDN)));
        unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(propertyName, cfgEntryDN));
        configAcceptable = false;
      }
    }
@@ -307,9 +303,7 @@

      if (pinStr == null)
      {
        unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
                String.valueOf(enVarName),
                String.valueOf(cfgEntryDN)));
        unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(enVarName, configEntryDN));
        configAcceptable = false;
      }
    }
@@ -320,9 +314,7 @@

      if (!pinFile.exists())
      {
        unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
                String.valueOf(fileName),
                String.valueOf(cfgEntryDN)));
        unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(fileName, configEntryDN));
        configAcceptable = false;
      }
      else
@@ -337,25 +329,17 @@
        {
          unacceptableReasons.add(
                  ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.get(
                          String.valueOf(fileName),
                          String.valueOf(cfgEntryDN),
                          getExceptionMessage(ioe)));
                      fileName, cfgEntryDN, getExceptionMessage(ioe)));
          configAcceptable = false;
        }
        finally
        {
          try
          {
            br.close();
          } catch (Exception e) {}
          StaticUtils.close(br);
        }

        if (pinStr == null)
        {

          unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
                  String.valueOf(fileName),
                  String.valueOf(cfgEntryDN)));
          unacceptableReasons.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(fileName, configEntryDN));
          configAcceptable = false;
        }
      }
@@ -367,9 +351,7 @@
      {
        // We should have a pin from the configuration, but no.
        unacceptableReasons.add(
            ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR.get(
              String.valueOf(cfgEntryDN),
              "null"));
            ERR_PKCS11_KEYMANAGER_CANNOT_DETERMINE_PIN_FROM_ATTR.get(cfgEntryDN, null));
        configAcceptable = false;
      }
    }
@@ -412,9 +394,7 @@
      {
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(
                String.valueOf(propertyName),
                String.valueOf(configEntryDN)));
        messages.add(ERR_PKCS11_KEYMANAGER_PIN_PROPERTY_NOT_SET.get(propertyName, configEntryDN));
      }
      else
      {
@@ -430,9 +410,7 @@
      {
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(
                String.valueOf(enVarName),
                String.valueOf(configEntryDN)));
        messages.add(ERR_PKCS11_KEYMANAGER_PIN_ENVAR_NOT_SET.get(enVarName, configEntryDN));
      }
      else
      {
@@ -448,9 +426,7 @@
      {
        resultCode = DirectoryServer.getServerErrorResultCode();

        messages.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(
                String.valueOf(fileName),
                String.valueOf(configEntryDN)));
        messages.add(ERR_PKCS11_KEYMANAGER_PIN_NO_SUCH_FILE.get(fileName, configEntryDN));
      }
      else
      {
@@ -463,27 +439,18 @@
        catch (IOException ioe)
        {
          resultCode = DirectoryServer.getServerErrorResultCode();

          messages.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_CANNOT_READ.get(
                  String.valueOf(fileName),
                  String.valueOf(configEntryDN),
                  getExceptionMessage(ioe)));
              fileName, configEntryDN, getExceptionMessage(ioe)));
        }
        finally
        {
          try
          {
            br.close();
          } catch (Exception e) {}
          StaticUtils.close(br);
        }

        if (pinStr == null)
        {
          resultCode = DirectoryServer.getServerErrorResultCode();

          messages.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(
                  String.valueOf(fileName),
                  String.valueOf(configEntryDN)));
          messages.add(ERR_PKCS11_KEYMANAGER_PIN_FILE_EMPTY.get(fileName, configEntryDN));
        }
        else
        {

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

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

        logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL.get(String.valueOf(o), String.valueOf(e)));
        logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL.get(o, e));
      }
    }

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

        logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(), String.valueOf(e)));
        logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(), e));
      }
    }
  }
@@ -417,8 +415,7 @@

      // This should not happen.  The only recourse we have is to log a message
      // and try again.
      logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread
          .currentThread().getName(), String.valueOf(e)));
      logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread.currentThread().getName(), e));
      return retryNextOperation(workerThread, numFailures + 1);
    }
  }

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

@@ -175,8 +175,7 @@
        try
        {
          LocalizableMessage message =
              ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(getName(), String
                  .valueOf(operation), stackTraceToSingleLineString(t));
              ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(getName(), operation, stackTraceToSingleLineString(t));
          logger.error(message);

          operation.setResultCode(DirectoryServer.getServerErrorResultCode());
@@ -198,12 +197,9 @@

        try
        {
          LocalizableMessage message = ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(getName(),
                                      String.valueOf(operation),
                                      stackTraceToSingleLineString(t));

          operation.disconnectClient(DisconnectReason.SERVER_ERROR,
                                     true, message);
          LocalizableMessage message = ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(
              getName(), operation, stackTraceToSingleLineString(t));
          operation.disconnectClient(DisconnectReason.SERVER_ERROR, true, message);
        }
        catch (Throwable t2)
        {

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

@@ -157,8 +157,7 @@
      identityMapper = DirectoryServer.getIdentityMapper(identityMapperDN);
      if (identityMapper == null)
      {
        LocalizableMessage message = ERR_EXTOP_PASSMOD_NO_SUCH_ID_MAPPER.get(
            String.valueOf(identityMapperDN), String.valueOf(config.dn()));
        LocalizableMessage message = ERR_EXTOP_PASSMOD_NO_SUCH_ID_MAPPER.get(identityMapperDN, config.dn());
        throw new ConfigException(message);
      }
    }
@@ -166,7 +165,7 @@
    {
      logger.traceException(e);
      LocalizableMessage message = ERR_EXTOP_PASSMOD_CANNOT_DETERMINE_ID_MAPPER.get(
          String.valueOf(config.dn()), getExceptionMessage(e));
          config.dn(), getExceptionMessage(e));
      throw new InitializationException(message, e);
    }

@@ -304,8 +303,7 @@
        if (userLock == null)
        {
          operation.setResultCode(ResultCode.BUSY);
          operation.appendErrorMessage(ERR_EXTOP_PASSMOD_CANNOT_LOCK_USER_ENTRY
              .get(String.valueOf(userDN)));
          operation.appendErrorMessage(ERR_EXTOP_PASSMOD_CANNOT_LOCK_USER_ENTRY.get(userDN));
          return;
        }

@@ -429,8 +427,7 @@
        if (!policy.isPasswordPolicy())
        {
          operation.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
          operation.appendErrorMessage(ERR_EXTOP_PASSMOD_ACCOUNT_NOT_LOCAL
              .get(String.valueOf(userDN)));
          operation.appendErrorMessage(ERR_EXTOP_PASSMOD_ACCOUNT_NOT_LOCAL.get(userDN));
          return;
        }
        pwPolicyState = (PasswordPolicyState) policy
@@ -442,9 +439,7 @@

        operation.setResultCode(DirectoryServer.getServerErrorResultCode());
        operation.appendErrorMessage(
                ERR_EXTOP_PASSMOD_CANNOT_GET_PW_POLICY.get(
                        String.valueOf(userDN),
                        de.getMessageObject()));
                ERR_EXTOP_PASSMOD_CANNOT_GET_PW_POLICY.get(userDN, de.getMessageObject()));
        return;
      }

@@ -750,8 +745,7 @@

              operation.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
              operation.appendErrorMessage(
                      ERR_EXTOP_PASSMOD_UNACCEPTABLE_PW.get(
                              String.valueOf(invalidReason)));
                      ERR_EXTOP_PASSMOD_UNACCEPTABLE_PW.get(invalidReason));
              return;
            }
          }
@@ -987,8 +981,8 @@
          // At this point, the user's password is already changed so there's
          // not much point in returning a non-success result.  However, we
          // should at least log that something went wrong.
          logger.warn(WARN_EXTOP_PASSMOD_CANNOT_UPDATE_PWP_STATE.get(String.valueOf(userDN),
                  String.valueOf(modOp.getResultCode()),
          logger.warn(WARN_EXTOP_PASSMOD_CANNOT_UPDATE_PWP_STATE.get(userDN,
                  modOp.getResultCode(),
                  modOp.getErrorMessage()));
        }
      }
@@ -1133,8 +1127,7 @@
      {
        operation.setResultCode(ResultCode.NO_SUCH_OBJECT);
        operation.appendErrorMessage(
                ERR_EXTOP_PASSMOD_NO_USER_ENTRY_BY_AUTHZID.get(
                        String.valueOf(entryDN)));
                ERR_EXTOP_PASSMOD_NO_USER_ENTRY_BY_AUTHZID.get(entryDN));

        // See if one of the entry's ancestors exists.
        operation.setMatchedDN(findMatchedDN(entryDN));
@@ -1218,10 +1211,7 @@
      IdentityMapper<?> mapper = DirectoryServer.getIdentityMapper(mapperDN);
      if (mapper == null)
      {
        LocalizableMessage message = ERR_EXTOP_PASSMOD_NO_SUCH_ID_MAPPER.get(
                String.valueOf(mapperDN),
                String.valueOf(config.dn()));
        unacceptableReasons.add(message);
        unacceptableReasons.add(ERR_EXTOP_PASSMOD_NO_SUCH_ID_MAPPER.get(mapperDN, config.dn()));
        return false;
      }
    }
@@ -1229,10 +1219,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_EXTOP_PASSMOD_CANNOT_DETERMINE_ID_MAPPER.get(
              String.valueOf(config.dn()),
              getExceptionMessage(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_EXTOP_PASSMOD_CANNOT_DETERMINE_ID_MAPPER.get(config.dn(), getExceptionMessage(e)));
      return false;
    }

@@ -1277,9 +1264,7 @@
      {
        resultCode = ResultCode.CONSTRAINT_VIOLATION;

        messages.add(ERR_EXTOP_PASSMOD_NO_SUCH_ID_MAPPER.get(
                String.valueOf(mapperDN),
                String.valueOf(config.dn())));
        messages.add(ERR_EXTOP_PASSMOD_NO_SUCH_ID_MAPPER.get(mapperDN, config.dn()));
      }
    }
    catch (Exception e)
@@ -1288,9 +1273,7 @@

      resultCode = DirectoryServer.getServerErrorResultCode();

      messages.add(ERR_EXTOP_PASSMOD_CANNOT_DETERMINE_ID_MAPPER.get(
              String.valueOf(config.dn()),
              getExceptionMessage(e)));
      messages.add(ERR_EXTOP_PASSMOD_CANNOT_DETERMINE_ID_MAPPER.get(config.dn(), getExceptionMessage(e)));
    }



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

@@ -392,8 +392,7 @@
      if (!policy.isPasswordPolicy())
      {
        operation.setResultCode(ResultCode.UNWILLING_TO_PERFORM);
        operation.appendErrorMessage(ERR_EXTOP_PWPSTATE_ACCOUNT_NOT_LOCAL
            .get(String.valueOf(userEntry)));
        operation.appendErrorMessage(ERR_EXTOP_PWPSTATE_ACCOUNT_NOT_LOCAL.get(userEntry));
        return;
      }
      pwpState = (PasswordPolicyState) policy
@@ -597,9 +596,7 @@
    }
    else if (matchingEntries.size() > 1)
    {
      LocalizableMessage message = ERR_PWPSTATE_EXTOP_MULTIPLE_ENTRIES.get(
              String.valueOf(targetDN));
      operation.appendErrorMessage(message);
      operation.appendErrorMessage(ERR_PWPSTATE_EXTOP_MULTIPLE_ENTRIES.get(targetDN));
      operation.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
      return null;
    }
@@ -1625,9 +1622,7 @@
        break;

      default:

        operation.appendErrorMessage(ERR_PWPSTATE_EXTOP_UNKNOWN_OP_TYPE.get(
            String.valueOf(opType)));
        operation.appendErrorMessage(ERR_PWPSTATE_EXTOP_UNKNOWN_OP_TYPE.get(opType));
        operation.setResultCode(ResultCode.CONSTRAINT_VIOLATION);
        return false;
    }

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

@@ -244,8 +244,7 @@
      if (readLock == null)
      {
        bindOperation.setResultCode(ResultCode.BUSY);
        bindOperation.setAuthFailureReason(INFO_SASLPLAIN_CANNOT_LOCK_ENTRY
            .get(String.valueOf(userDN)));
        bindOperation.setAuthFailureReason(INFO_SASLPLAIN_CANNOT_LOCK_ENTRY.get(userDN));
        return;
      }

@@ -259,9 +258,7 @@

        bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

        LocalizableMessage message = ERR_SASLPLAIN_CANNOT_GET_ENTRY_BY_DN.get(
                String.valueOf(userDN),
                de.getMessageObject());
        LocalizableMessage message = ERR_SASLPLAIN_CANNOT_GET_ENTRY_BY_DN.get(userDN, de.getMessageObject());
        bindOperation.setAuthFailureReason(message);
        return;
      }
@@ -288,9 +285,7 @@

        bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

        LocalizableMessage message = ERR_SASLPLAIN_CANNOT_MAP_USERNAME.get(
                String.valueOf(authcID),
                de.getMessageObject());
        LocalizableMessage message = ERR_SASLPLAIN_CANNOT_MAP_USERNAME.get(authcID, de.getMessageObject());
        bindOperation.setAuthFailureReason(message);
        return;
      }
@@ -354,8 +349,7 @@
          {
            bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

            LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(
                    String.valueOf(userEntry.getName()));
            LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(userEntry.getName());
            bindOperation.setAuthFailureReason(message);
            return;
          }
@@ -373,8 +367,7 @@
              {
                bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

                LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_NO_SUCH_ENTRY.get(
                        String.valueOf(authzDN));
                LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_NO_SUCH_ENTRY.get(authzDN);
                bindOperation.setAuthFailureReason(message);
                return;
              }
@@ -385,9 +378,7 @@

              bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

              LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_CANNOT_GET_ENTRY.get(
                      String.valueOf(authzDN),
                      de.getMessageObject());
              LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_CANNOT_GET_ENTRY.get(authzDN, de.getMessageObject());
              bindOperation.setAuthFailureReason(message);
              return;
            }
@@ -450,8 +441,7 @@
          {
            bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

            LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(
                    String.valueOf(userEntry.getName()));
            LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(userEntry.getName());
            bindOperation.setAuthFailureReason(message);
            return;
          }
@@ -493,9 +483,7 @@

      bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);

      LocalizableMessage message = ERR_SASLPLAIN_CANNOT_CHECK_PASSWORD_VALIDITY.get(
              String.valueOf(userEntry.getName()),
              String.valueOf(e));
      LocalizableMessage message = ERR_SASLPLAIN_CANNOT_CHECK_PASSWORD_VALIDITY.get(userEntry.getName(), e);
      bindOperation.setAuthFailureReason(message);
      return;
    }

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

@@ -111,8 +111,7 @@

      if (encodedCharacterSets.size() == 0)
      {
        LocalizableMessage message =
            ERR_RANDOMPWGEN_NO_CHARSETS.get(String.valueOf(configEntryDN));
        LocalizableMessage message = ERR_RANDOMPWGEN_NO_CHARSETS.get(configEntryDN);
        throw new ConfigException(message);
      }
      for (NamedCharacterSet s : NamedCharacterSet
@@ -120,8 +119,7 @@
      {
        if (charsets.containsKey(s.getName()))
        {
          LocalizableMessage message = ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
              String.valueOf(configEntryDN), s.getName());
          LocalizableMessage message = ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(configEntryDN, s.getName());
          throw new ConfigException(message);
        }
        else
@@ -168,9 +166,7 @@
          NamedCharacterSet charset = charsets.get(name);
          if (charset == null)
          {
            LocalizableMessage message = ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
                String.valueOf(formatString), String.valueOf(name));
            throw new ConfigException(message);
            throw new ConfigException(ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(formatString, name));
          }
          else
          {
@@ -186,8 +182,7 @@
        {
          logger.traceException(e);

          LocalizableMessage message = ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
              String.valueOf(formatString));
          LocalizableMessage message = ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(formatString);
          throw new ConfigException(message, e);
        }
      }
@@ -296,9 +291,7 @@
      SortedSet<String> currentPasSet = configuration.getPasswordCharacterSet();
      if (currentPasSet.size() == 0)
      {
        LocalizableMessage message =
            ERR_RANDOMPWGEN_NO_CHARSETS.get(String.valueOf(cfgEntryDN));
        throw new ConfigException(message);
        throw new ConfigException(ERR_RANDOMPWGEN_NO_CHARSETS.get(cfgEntryDN));
      }

      for (NamedCharacterSet s : NamedCharacterSet
@@ -306,9 +299,7 @@
      {
        if (charsets.containsKey(s.getName()))
        {
          LocalizableMessage message = ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
                  String.valueOf(cfgEntryDN), s.getName());
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(cfgEntryDN, s.getName()));
          return false;
        }
        else
@@ -348,14 +339,11 @@
          {
            int    colonPos = token.indexOf(':');
            String name     = token.substring(0, colonPos);
            int    count    = Integer.parseInt(token.substring(colonPos+1));

            NamedCharacterSet charset = charsets.get(name);
            if (charset == null)
            {
              LocalizableMessage message = ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
                      String.valueOf(formatString), String.valueOf(name));
              unacceptableReasons.add(message);
              unacceptableReasons.add(ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(formatString, name));
              return false;
            }
          }
@@ -363,9 +351,7 @@
          {
            logger.traceException(e);

            LocalizableMessage message = ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
                    String.valueOf(formatString));
            unacceptableReasons.add(message);
            unacceptableReasons.add(ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(formatString));
            return false;
          }
        }
@@ -408,8 +394,7 @@
      newEncodedCharacterSets = configuration.getPasswordCharacterSet();
      if (newEncodedCharacterSets.size() == 0)
      {
        messages.add(ERR_RANDOMPWGEN_NO_CHARSETS.get(
                String.valueOf(configEntryDN)));
        messages.add(ERR_RANDOMPWGEN_NO_CHARSETS.get(configEntryDN));

        if (resultCode == ResultCode.SUCCESS)
        {
@@ -423,9 +408,7 @@
        {
          if (charsets.containsKey(s.getName()))
          {
            messages.add(ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(
                    String.valueOf(configEntryDN),
                    s.getName()));
            messages.add(ERR_RANDOMPWGEN_CHARSET_NAME_CONFLICT.get(configEntryDN, s.getName()));

            if (resultCode == ResultCode.SUCCESS)
            {
@@ -487,9 +470,7 @@
          NamedCharacterSet charset = charsets.get(name);
          if (charset == null)
          {
            messages.add(ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(
                    String.valueOf(newFormatString),
                    String.valueOf(name)));
            messages.add(ERR_RANDOMPWGEN_UNKNOWN_CHARSET.get(newFormatString, name));

            if (resultCode == ResultCode.SUCCESS)
            {
@@ -506,8 +487,7 @@
        {
          logger.traceException(e);

          messages.add(ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(
                  String.valueOf(newFormatString)));
          messages.add(ERR_RANDOMPWGEN_INVALID_PWFORMAT.get(newFormatString));

          if (resultCode == ResultCode.SUCCESS)
          {

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

@@ -249,8 +249,7 @@

        case SIZE_LIMIT_EXCEEDED:
          // Multiple entries matched the filter.  This is not acceptable.
          LocalizableMessage message = ERR_REGEXMAP_MULTIPLE_MATCHING_ENTRIES.get(
                          String.valueOf(processedID));
          LocalizableMessage message = ERR_REGEXMAP_MULTIPLE_MATCHING_ENTRIES.get(processedID);
          throw new DirectoryException(
                  ResultCode.CONSTRAINT_VIOLATION, message);

@@ -258,16 +257,12 @@
        case TIME_LIMIT_EXCEEDED:
        case ADMIN_LIMIT_EXCEEDED:
          // The search criteria was too inefficient.
          message = ERR_REGEXMAP_INEFFICIENT_SEARCH.get(
                           String.valueOf(processedID),
                         String.valueOf(internalSearch.getErrorMessage()));
          message = ERR_REGEXMAP_INEFFICIENT_SEARCH.get(processedID, internalSearch.getErrorMessage());
          throw new DirectoryException(internalSearch.getResultCode(), message);

        default:
          // Just pass on the failure that was returned for this search.
          message = ERR_REGEXMAP_SEARCH_FAILED.get(
                           String.valueOf(processedID),
                         String.valueOf(internalSearch.getErrorMessage()));
          message = ERR_REGEXMAP_SEARCH_FAILED.get(processedID, internalSearch.getErrorMessage());
          throw new DirectoryException(internalSearch.getResultCode(), message);
      }

@@ -281,18 +276,14 @@
          matchingEntry = iterator.next();
          if (iterator.hasNext())
          {
            LocalizableMessage message = ERR_REGEXMAP_MULTIPLE_MATCHING_ENTRIES.get(
                            String.valueOf(processedID));
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                         message);
            LocalizableMessage message = ERR_REGEXMAP_MULTIPLE_MATCHING_ENTRIES.get(processedID);
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
          }
        }
        else
        {
          LocalizableMessage message = ERR_REGEXMAP_MULTIPLE_MATCHING_ENTRIES.get(
                          String.valueOf(processedID));
          throw new DirectoryException(
                  ResultCode.CONSTRAINT_VIOLATION, message);
          LocalizableMessage message = ERR_REGEXMAP_MULTIPLE_MATCHING_ENTRIES.get(processedID);
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
        }
      }
    }

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

@@ -202,8 +202,7 @@
      }
      else
      {
        final LocalizableMessage message = INFO_SASL_UNSUPPORTED_CALLBACK.get(mechanism,
            String.valueOf(callback));
        final LocalizableMessage message = INFO_SASL_UNSUPPORTED_CALLBACK.get(mechanism, callback);
        throw new UnsupportedCallbackException(callback, message.toString());
      }
    }
@@ -726,8 +725,7 @@
        {
          if ((authzEntry = DirectoryServer.getEntry(authzDN)) == null)
          {
            setCallbackMsg(ERR_SASL_AUTHZID_NO_SUCH_ENTRY.get(String
                .valueOf(authzDN)));
            setCallbackMsg(ERR_SASL_AUTHZID_NO_SUCH_ENTRY.get(authzDN));
            callback.setAuthorized(false);
            return;
          }
@@ -735,8 +733,7 @@
        catch (final DirectoryException e)
        {
          logger.traceException(e);
          setCallbackMsg(ERR_SASL_AUTHZID_CANNOT_GET_ENTRY.get(
              String.valueOf(authzDN), e.getMessageObject()));
          setCallbackMsg(ERR_SASL_AUTHZID_CANNOT_GET_ENTRY.get(authzDN, e.getMessageObject()));
          callback.setAuthorized(false);
          return;
        }
@@ -867,7 +864,7 @@
    final Lock readLock = LockManager.lockRead(userDN);
    if (readLock == null)
    {
      setCallbackMsg(INFO_SASL_CANNOT_LOCK_ENTRY.get(String.valueOf(userDN)));
      setCallbackMsg(INFO_SASL_CANNOT_LOCK_ENTRY.get(userDN));
      return;
    }

@@ -879,8 +876,7 @@
    {
      logger.traceException(e);
      setCallbackMsg(ERR_SASL_CANNOT_GET_ENTRY_BY_DN.get(
          String.valueOf(userDN), SASL_MECHANISM_DIGEST_MD5,
          e.getMessageObject()));
          userDN, SASL_MECHANISM_DIGEST_MD5, e.getMessageObject()));
    }
    finally
    {
@@ -961,8 +957,7 @@
    if (!AccessControlConfigManager.getInstance().getAccessControlHandler()
        .mayProxy(authInfo.getAuthenticationEntry(), e, bindOp))
    {
      setCallbackMsg(ERR_SASL_AUTHZID_INSUFFICIENT_ACCESS.get(String
          .valueOf(authEntry.getName())));
      setCallbackMsg(ERR_SASL_AUTHZID_INSUFFICIENT_ACCESS.get(authEntry.getName()));
      ret = false;
    }

@@ -987,8 +982,7 @@
        authInfo);
    if (!tempConn.hasPrivilege(Privilege.PROXIED_AUTH, bindOp))
    {
      setCallbackMsg(ERR_SASL_AUTHZID_INSUFFICIENT_PRIVILEGES.get(String
          .valueOf(authEntry.getName())));
      setCallbackMsg(ERR_SASL_AUTHZID_INSUFFICIENT_PRIVILEGES.get(authEntry.getName()));
      ret = false;
    }
    return ret;
@@ -1096,8 +1090,7 @@
      catch (final DirectoryException e)
      {
        logger.traceException(e);
        setCallbackMsg(ERR_SASLDIGESTMD5_CANNOT_MAP_USERNAME.get(
            String.valueOf(userName), e.getMessageObject()));
        setCallbackMsg(ERR_SASLDIGESTMD5_CANNOT_MAP_USERNAME.get(userName, e.getMessageObject()));
      }
    }
    /*
@@ -1134,8 +1127,7 @@

      if (!authState.isPasswordPolicy())
      {
        final LocalizableMessage message = ERR_SASL_ACCOUNT_NOT_LOCAL.get(mechanism,
            String.valueOf(authEntry.getName()));
        final LocalizableMessage message = ERR_SASL_ACCOUNT_NOT_LOCAL.get(mechanism,authEntry.getName());
        setCallbackMsg(ResultCode.INAPPROPRIATE_AUTHENTICATION, message);
        return;
      }
@@ -1145,16 +1137,14 @@
      clearPasswords = pwPolicyState.getClearPasswords();
      if ((clearPasswords == null) || clearPasswords.isEmpty())
      {
        setCallbackMsg(ERR_SASL_NO_REVERSIBLE_PASSWORDS.get(mechanism,
            String.valueOf(authEntry.getName())));
        setCallbackMsg(ERR_SASL_NO_REVERSIBLE_PASSWORDS.get(mechanism, authEntry.getName()));
        return;
      }
    }
    catch (final Exception e)
    {
      logger.traceException(e);
      setCallbackMsg(ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS.get(
          String.valueOf(authEntry.getName()), mechanism, String.valueOf(e)));
      setCallbackMsg(ERR_SASL_CANNOT_GET_REVERSIBLE_PASSWORDS.get(authEntry.getName(), mechanism, e));
      return;
    }


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

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

      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(
          MESSAGE_DIGEST_ALGORITHM_SHA_1, String.valueOf(e));
          MESSAGE_DIGEST_ALGORITHM_SHA_1, e);
      throw new InitializationException(message, e);
    }

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


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

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

      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(
          MESSAGE_DIGEST_ALGORITHM_MD5, String.valueOf(e));
      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(MESSAGE_DIGEST_ALGORITHM_MD5, e);
      throw new InitializationException(message, e);
    }


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

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

      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(
          MESSAGE_DIGEST_ALGORITHM_SHA_1, String.valueOf(e));
      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(MESSAGE_DIGEST_ALGORITHM_SHA_1, e);
      throw new InitializationException(message, e);
    }

@@ -532,7 +531,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(
          MESSAGE_DIGEST_ALGORITHM_SHA_1, String.valueOf(e));
          MESSAGE_DIGEST_ALGORITHM_SHA_1, e);
      throw new DirectoryException(ResultCode.OTHER, message, e);
    }


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

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

      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(
          MESSAGE_DIGEST_ALGORITHM_SHA_256, String.valueOf(e));
          MESSAGE_DIGEST_ALGORITHM_SHA_256, e);
      throw new InitializationException(message, e);
    }


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

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

      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(
          MESSAGE_DIGEST_ALGORITHM_SHA_384, String.valueOf(e));
          MESSAGE_DIGEST_ALGORITHM_SHA_384, e);
      throw new InitializationException(message, e);
    }


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

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

      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(
          MESSAGE_DIGEST_ALGORITHM_SHA_512, String.valueOf(e));
          MESSAGE_DIGEST_ALGORITHM_SHA_512, e);
      throw new InitializationException(message, e);
    }

@@ -537,7 +537,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_PWSCHEME_CANNOT_INITIALIZE_MESSAGE_DIGEST.get(
          MESSAGE_DIGEST_ALGORITHM_SHA_512, String.valueOf(e));
          MESSAGE_DIGEST_ALGORITHM_SHA_512, e);
      throw new DirectoryException(ResultCode.OTHER, message, e);
    }


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

@@ -121,9 +121,7 @@
      {
        // Should not happen
        logger.traceException(de);
        LocalizableMessage message = ERR_STATICMEMBERS_CANNOT_DECODE_DN.
            get(String.valueOf(dn), String.valueOf(groupDN),
                String.valueOf(de.getMessageObject()));
        LocalizableMessage message = ERR_STATICMEMBERS_CANNOT_DECODE_DN.get(dn, groupDN, de.getMessageObject());
        throw new MembershipException(message, true, de);
      }
    }
@@ -149,8 +147,7 @@
        Entry memberEntry = DirectoryConfig.getEntry(DN.decode(memberDN));
        if (memberEntry == null)
        {
          LocalizableMessage message = ERR_STATICMEMBERS_NO_SUCH_ENTRY.get(
              String.valueOf(memberDN), String.valueOf(groupDN));
          LocalizableMessage message = ERR_STATICMEMBERS_NO_SUCH_ENTRY.get(memberDN, groupDN);
          throw new MembershipException(message, true);
        }

@@ -160,9 +157,7 @@
      {
        logger.traceException(de);

        LocalizableMessage message = ERR_STATICMEMBERS_CANNOT_GET_ENTRY.
            get(String.valueOf(memberDN), String.valueOf(groupDN),
                String.valueOf(de.getMessageObject()));
        LocalizableMessage message = ERR_STATICMEMBERS_CANNOT_GET_ENTRY.get(memberDN, groupDN, de.getMessageObject());
        throw new MembershipException(message, true, de);
      }
    }

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

@@ -181,15 +181,13 @@
      if (groupEntry.hasObjectClass(groupOfNamesClass))
      {
        LocalizableMessage message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
            get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_ENTRIES,
                OC_GROUP_OF_NAMES);
            get(groupEntry.getName(), OC_GROUP_OF_ENTRIES, OC_GROUP_OF_NAMES);
        throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
      }
      else if (groupEntry.hasObjectClass(groupOfUniqueNamesClass))
      {
        LocalizableMessage message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
            get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_ENTRIES,
                OC_GROUP_OF_UNIQUE_NAMES);
            get(groupEntry.getName(), OC_GROUP_OF_ENTRIES, OC_GROUP_OF_UNIQUE_NAMES);
        throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
      }

@@ -201,8 +199,7 @@
      if (groupEntry.hasObjectClass(groupOfUniqueNamesClass))
      {
        LocalizableMessage message = ERR_STATICGROUP_INVALID_OC_COMBINATION.
            get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_NAMES,
                OC_GROUP_OF_UNIQUE_NAMES);
            get(groupEntry.getName(), OC_GROUP_OF_NAMES, OC_GROUP_OF_UNIQUE_NAMES);
        throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
      }

@@ -217,8 +214,7 @@
    else
    {
      LocalizableMessage message = ERR_STATICGROUP_NO_VALID_OC.
          get(String.valueOf(groupEntry.getName()), OC_GROUP_OF_NAMES,
              OC_GROUP_OF_UNIQUE_NAMES);
          get(groupEntry.getName(), OC_GROUP_OF_NAMES, OC_GROUP_OF_UNIQUE_NAMES);
      throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
    }

@@ -400,10 +396,8 @@
      if (nestedGroups.contains(nestedGroupDN))
      {
        LocalizableMessage msg = ERR_STATICGROUP_ADD_NESTED_GROUP_ALREADY_EXISTS.get(
                String.valueOf(nestedGroupDN),
                String.valueOf(groupEntryDN));
        throw new DirectoryException(
                ResultCode.ATTRIBUTE_OR_VALUE_EXISTS, msg);
            nestedGroupDN, groupEntryDN);
        throw new DirectoryException(ResultCode.ATTRIBUTE_OR_VALUE_EXISTS, msg);
      }

      Attribute attr = Attributes.create(memberAttributeType,
@@ -459,9 +453,7 @@
      {
        throw new DirectoryException(
                ResultCode.NO_SUCH_ATTRIBUTE,
                ERR_STATICGROUP_REMOVE_NESTED_GROUP_NO_SUCH_GROUP.get(
                  String.valueOf(nestedGroupDN),
                  String.valueOf(groupEntryDN)));
                ERR_STATICGROUP_REMOVE_NESTED_GROUP_NO_SUCH_GROUP.get(nestedGroupDN, groupEntryDN));
      }

      Attribute attr = Attributes.create(memberAttributeType,
@@ -486,9 +478,7 @@
        throw new DirectoryException(
                modifyOperation.getResultCode(),
                ERR_STATICGROUP_REMOVE_MEMBER_UPDATE_FAILED.get(
                        String.valueOf(nestedGroupDN),
                        String.valueOf(groupEntryDN),
                        modifyOperation.getErrorMessage()));
                    nestedGroupDN, groupEntryDN, modifyOperation.getErrorMessage()));
      }


@@ -573,8 +563,7 @@
        if(thisGroup == null) {
          throw new DirectoryException(
                  ResultCode.NO_SUCH_ATTRIBUTE,
                  ERR_STATICGROUP_GROUP_INSTANCE_INVALID.get(
                    String.valueOf(groupEntryDN)));
                  ERR_STATICGROUP_GROUP_INSTANCE_INVALID.get(groupEntryDN));
        } else if(thisGroup != this) {
          LinkedHashSet<ByteString> newMemberDNs =
                  new LinkedHashSet<ByteString>();
@@ -667,10 +656,8 @@

      if (memberDNs.contains(userDNString))
      {
        LocalizableMessage message = ERR_STATICGROUP_ADD_MEMBER_ALREADY_EXISTS.get(
            String.valueOf(userDN), String.valueOf(groupEntryDN));
        throw new DirectoryException(ResultCode.ATTRIBUTE_OR_VALUE_EXISTS,
                                     message);
        LocalizableMessage message = ERR_STATICGROUP_ADD_MEMBER_ALREADY_EXISTS.get(userDN, groupEntryDN);
        throw new DirectoryException(ResultCode.ATTRIBUTE_OR_VALUE_EXISTS, message);
      }

      Attribute attr = Attributes.create(memberAttributeType, userDN
@@ -721,8 +708,7 @@
    {
      if (! memberDNs.contains(userDNString))
      {
        LocalizableMessage message = ERR_STATICGROUP_REMOVE_MEMBER_NO_SUCH_MEMBER.get(
            String.valueOf(userDN), String.valueOf(groupEntryDN));
        LocalizableMessage message = ERR_STATICGROUP_REMOVE_MEMBER_NO_SUCH_MEMBER.get(userDN, groupEntryDN);
        throw new DirectoryException(ResultCode.NO_SUCH_ATTRIBUTE, message);
      }


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

@@ -115,8 +115,7 @@
      int colonPos = lowerMap.indexOf(':');
      if (colonPos <= 0)
      {
        LocalizableMessage message = ERR_SATUACM_INVALID_MAP_FORMAT.get(
            String.valueOf(configEntryDN), mapStr);
        LocalizableMessage message = ERR_SATUACM_INVALID_MAP_FORMAT.get(configEntryDN, mapStr);
        throw new ConfigException(message);
      }

@@ -124,8 +123,7 @@
      String userAttrName = lowerMap.substring(colonPos+1).trim();
      if ((certAttrName.length() == 0) || (userAttrName.length() == 0))
      {
        LocalizableMessage message = ERR_SATUACM_INVALID_MAP_FORMAT.get(
            String.valueOf(configEntryDN), mapStr);
        LocalizableMessage message = ERR_SATUACM_INVALID_MAP_FORMAT.get(configEntryDN, mapStr);
        throw new ConfigException(message);
      }

@@ -135,8 +133,7 @@

      if (attributeMap.containsKey(certAttrName))
      {
        LocalizableMessage message = ERR_SATUACM_DUPLICATE_CERT_ATTR.get(
            String.valueOf(configEntryDN), certAttrName);
        LocalizableMessage message = ERR_SATUACM_DUPLICATE_CERT_ATTR.get(configEntryDN, certAttrName);
        throw new ConfigException(message);
      }

@@ -144,8 +141,7 @@
           DirectoryServer.getAttributeType(userAttrName, false);
      if (userAttrType == null)
      {
        LocalizableMessage message = ERR_SATUACM_NO_SUCH_ATTR.get(
            mapStr, String.valueOf(configEntryDN), userAttrName);
        LocalizableMessage message = ERR_SATUACM_NO_SUCH_ATTR.get(mapStr, configEntryDN, userAttrName);
        throw new ConfigException(message);
      }

@@ -153,9 +149,7 @@
      {
        if (attrType.equals(userAttrType))
        {
          LocalizableMessage message = ERR_SATUACM_DUPLICATE_USER_ATTR.get(
              String.valueOf(configEntryDN), attrType.getNameOrOID());
          throw new ConfigException(message);
          throw new ConfigException(ERR_SATUACM_DUPLICATE_USER_ATTR.get(configEntryDN, attrType.getNameOrOID()));
        }
      }

@@ -234,8 +228,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_SATUACM_PEER_CERT_NOT_X509.get(
          String.valueOf(certificateChain[0].getType()));
      LocalizableMessage message = ERR_SATUACM_PEER_CERT_NOT_X509.get(certificateChain[0].getType());
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
    }

@@ -279,8 +272,7 @@

    if (filterComps.isEmpty())
    {
      LocalizableMessage message = ERR_SATUACM_NO_MAPPABLE_ATTRIBUTES.get(
           String.valueOf(peerDN));
      LocalizableMessage message = ERR_SATUACM_NO_MAPPABLE_ATTRIBUTES.get(peerDN);
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
    }

@@ -321,28 +313,19 @@

        case SIZE_LIMIT_EXCEEDED:
          // Multiple entries matched the filter.  This is not acceptable.
          LocalizableMessage message = ERR_SATUACM_MULTIPLE_SEARCH_MATCHING_ENTRIES.get(
                        String.valueOf(peerDN));
          throw new DirectoryException(
                  ResultCode.INVALID_CREDENTIALS, message);

          LocalizableMessage message = ERR_SATUACM_MULTIPLE_SEARCH_MATCHING_ENTRIES.get(peerDN);
          throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);

        case TIME_LIMIT_EXCEEDED:
        case ADMIN_LIMIT_EXCEEDED:
          // The search criteria was too inefficient.
          message = ERR_SATUACM_INEFFICIENT_SEARCH.get(
                         String.valueOf(peerDN),
                         String.valueOf(searchOperation.getErrorMessage()));
          throw new DirectoryException(searchOperation.getResultCode(),
              message);
          message = ERR_SATUACM_INEFFICIENT_SEARCH.get(peerDN, searchOperation.getErrorMessage());
          throw new DirectoryException(searchOperation.getResultCode(), message);

        default:
          // Just pass on the failure that was returned for this search.
          message = ERR_SATUACM_SEARCH_FAILED.get(
                         String.valueOf(peerDN),
                         String.valueOf(searchOperation.getErrorMessage()));
          throw new DirectoryException(searchOperation.getResultCode(),
              message);
          message = ERR_SATUACM_SEARCH_FAILED.get(peerDN, searchOperation.getErrorMessage());
          throw new DirectoryException(searchOperation.getResultCode(), message);
      }

      for (SearchResultEntry entry : searchOperation.getSearchEntries())
@@ -354,8 +337,7 @@
        else
        {
          LocalizableMessage message = ERR_SATUACM_MULTIPLE_MATCHING_ENTRIES.
              get(String.valueOf(peerDN), String.valueOf(userEntry.getName()),
                  String.valueOf(entry.getName()));
              get(peerDN, userEntry.getName(), entry.getName());
          throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
        }
      }
@@ -405,9 +387,7 @@
      int colonPos = lowerMap.indexOf(':');
      if (colonPos <= 0)
      {
        unacceptableReasons.add(ERR_SATUACM_INVALID_MAP_FORMAT.get(
                String.valueOf(cfgEntryDN),
                mapStr));
        unacceptableReasons.add(ERR_SATUACM_INVALID_MAP_FORMAT.get(cfgEntryDN, mapStr));
        configAcceptable = false;
        break;
      }
@@ -416,9 +396,7 @@
      String userAttrName = lowerMap.substring(colonPos+1).trim();
      if ((certAttrName.length() == 0) || (userAttrName.length() == 0))
      {
        unacceptableReasons.add(ERR_SATUACM_INVALID_MAP_FORMAT.get(
                String.valueOf(cfgEntryDN),
                mapStr));
        unacceptableReasons.add(ERR_SATUACM_INVALID_MAP_FORMAT.get(cfgEntryDN, mapStr));
        configAcceptable = false;
        break;
      }
@@ -428,9 +406,7 @@

      if (newAttributeMap.containsKey(certAttrName))
      {
        unacceptableReasons.add(ERR_SATUACM_DUPLICATE_CERT_ATTR.get(
                String.valueOf(cfgEntryDN),
                certAttrName));
        unacceptableReasons.add(ERR_SATUACM_DUPLICATE_CERT_ATTR.get(cfgEntryDN, certAttrName));
        configAcceptable = false;
        break;
      }
@@ -439,10 +415,7 @@
           DirectoryServer.getAttributeType(userAttrName, false);
      if (userAttrType == null)
      {
        unacceptableReasons.add(ERR_SATUACM_NO_SUCH_ATTR.get(
                mapStr,
                String.valueOf(cfgEntryDN),
                userAttrName));
        unacceptableReasons.add(ERR_SATUACM_NO_SUCH_ATTR.get(mapStr, cfgEntryDN, userAttrName));
        configAcceptable = false;
        break;
      }
@@ -451,9 +424,7 @@
      {
        if (attrType.equals(userAttrType))
        {
          unacceptableReasons.add(ERR_SATUACM_DUPLICATE_USER_ATTR.get(
                  String.valueOf(cfgEntryDN),
                  attrType.getNameOrOID()));
          unacceptableReasons.add(ERR_SATUACM_DUPLICATE_USER_ATTR.get(cfgEntryDN, attrType.getNameOrOID()));
          configAcceptable = false;
          break mapLoop;
        }
@@ -496,8 +467,7 @@
        }


        messages.add(ERR_SATUACM_INVALID_MAP_FORMAT.get(
                String.valueOf(configEntryDN), mapStr));
        messages.add(ERR_SATUACM_INVALID_MAP_FORMAT.get(configEntryDN, mapStr));
        break;
      }

@@ -511,8 +481,7 @@
        }


        messages.add(ERR_SATUACM_INVALID_MAP_FORMAT.get(
                String.valueOf(configEntryDN), mapStr));
        messages.add(ERR_SATUACM_INVALID_MAP_FORMAT.get(configEntryDN, mapStr));
        break;
      }

@@ -527,9 +496,7 @@
        }


        messages.add(ERR_SATUACM_DUPLICATE_CERT_ATTR.get(
                String.valueOf(configEntryDN),
                certAttrName));
        messages.add(ERR_SATUACM_DUPLICATE_CERT_ATTR.get(configEntryDN, certAttrName));
        break;
      }

@@ -543,9 +510,7 @@
        }


        messages.add(ERR_SATUACM_NO_SUCH_ATTR.get(
                mapStr, String.valueOf(configEntryDN),
                userAttrName));
        messages.add(ERR_SATUACM_NO_SUCH_ATTR.get(mapStr, configEntryDN, userAttrName));
        break;
      }

@@ -559,9 +524,7 @@
          }


          messages.add(ERR_SATUACM_DUPLICATE_USER_ATTR.get(
                  String.valueOf(configEntryDN),
                  attrType.getNameOrOID()));
          messages.add(ERR_SATUACM_DUPLICATE_USER_ATTR.get(configEntryDN, attrType.getNameOrOID()));
          break mapLoop;
        }
      }

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

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

      LocalizableMessage message = ERR_SDTUACM_PEER_CERT_NOT_X509.get(
          String.valueOf(certificateChain[0].getType()));
      LocalizableMessage message = ERR_SDTUACM_PEER_CERT_NOT_X509.get(certificateChain[0].getType());
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
    }

@@ -230,19 +229,13 @@
        case TIME_LIMIT_EXCEEDED:
        case ADMIN_LIMIT_EXCEEDED:
          // The search criteria was too inefficient.
          message = ERR_SDTUACM_INEFFICIENT_SEARCH.get(
                         peerName,
                         String.valueOf(searchOperation.getErrorMessage()));
          throw new DirectoryException(searchOperation.getResultCode(),
              message);
          message = ERR_SDTUACM_INEFFICIENT_SEARCH.get(peerName, searchOperation.getErrorMessage());
          throw new DirectoryException(searchOperation.getResultCode(), message);

        default:
          // Just pass on the failure that was returned for this search.
          message = ERR_SDTUACM_SEARCH_FAILED.get(
                         peerName,
                         String.valueOf(searchOperation.getErrorMessage()));
          throw new DirectoryException(searchOperation.getResultCode(),
              message);
          message = ERR_SDTUACM_SEARCH_FAILED.get(peerName, searchOperation.getErrorMessage());
          throw new DirectoryException(searchOperation.getResultCode(), message);
      }

      for (SearchResultEntry entry : searchOperation.getSearchEntries())
@@ -254,8 +247,7 @@
        else
        {
          LocalizableMessage message = ERR_SDTUACM_MULTIPLE_MATCHING_ENTRIES.
              get(peerName, String.valueOf(userEntry.getName()),
                  String.valueOf(entry.getName()));
              get(peerName, userEntry.getName(), entry.getName());
          throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
        }
      }

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

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

      LocalizableMessage message = ERR_SEDCM_PEER_CERT_NOT_X509.get(
          String.valueOf(certificateChain[0].getType()));
      LocalizableMessage message = ERR_SEDCM_PEER_CERT_NOT_X509.get(certificateChain[0].getType());
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
    }

@@ -138,8 +137,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_SEDCM_CANNOT_DECODE_SUBJECT_AS_DN.get(
          String.valueOf(peerPrincipal), getExceptionMessage(e));
      LocalizableMessage message = ERR_SEDCM_CANNOT_DECODE_SUBJECT_AS_DN.get(peerPrincipal, getExceptionMessage(e));
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
    }

@@ -149,8 +147,7 @@
    final Lock readLock = LockManager.lockRead(subjectDN);
    if (readLock == null)
    {
      throw new DirectoryException(ResultCode.BUSY, ERR_SEDCM_CANNOT_LOCK_ENTRY
          .get(String.valueOf(subjectDN)));
      throw new DirectoryException(ResultCode.BUSY, ERR_SEDCM_CANNOT_LOCK_ENTRY.get(subjectDN));
    }


@@ -164,19 +161,15 @@
    {
      logger.traceException(de);

      LocalizableMessage message = ERR_SEDCM_CANNOT_GET_ENTRY.get(
          String.valueOf(subjectDN), de.getMessageObject());
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message,
                                   de);
      LocalizableMessage message = ERR_SEDCM_CANNOT_GET_ENTRY.get(subjectDN, de.getMessageObject());
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message, de);
    }
    catch (Exception e)
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_SEDCM_CANNOT_GET_ENTRY.get(
          String.valueOf(subjectDN), getExceptionMessage(e));
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message,
                                   e);
      LocalizableMessage message = ERR_SEDCM_CANNOT_GET_ENTRY.get(subjectDN, getExceptionMessage(e));
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message, e);
    }
    finally
    {
@@ -186,7 +179,7 @@

    if (userEntry == null)
    {
      LocalizableMessage message = ERR_SEDCM_NO_USER_FOR_DN.get(String.valueOf(subjectDN));
      LocalizableMessage message = ERR_SEDCM_NO_USER_FOR_DN.get(subjectDN);
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message);
    }
    else

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

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

        logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL.get(String.valueOf(o),
            String.valueOf(e)));
        logger.warn(WARN_QUEUE_UNABLE_TO_CANCEL.get(o, e));
      }
    }

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

        logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(),
            String.valueOf(e)));
        logger.warn(WARN_QUEUE_UNABLE_TO_NOTIFY_THREAD.get(t.getName(), e));
      }
    }
  }
@@ -516,8 +512,7 @@

      // If we've gotten here, then the worker thread was interrupted for some
      // other reason. This should not happen, and we need to log a message.
      logger.warn(WARN_WORKER_INTERRUPTED_WITHOUT_SHUTDOWN.get(Thread
          .currentThread().getName(), String.valueOf(ie)));
      logger.warn(WARN_WORKER_INTERRUPTED_WITHOUT_SHUTDOWN.get(Thread.currentThread().getName(), ie));
    }
    catch (Exception e)
    {
@@ -525,8 +520,7 @@

      // This should not happen. The only recourse we have is to log a message
      // and try again.
      logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread
          .currentThread().getName(), String.valueOf(e)));
      logger.warn(WARN_WORKER_WAITING_UNCAUGHT_EXCEPTION.get(Thread.currentThread().getName(), e));
    }
    finally
    {

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

@@ -175,8 +175,7 @@
        try
        {
          LocalizableMessage message =
              ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(getName(), String
                  .valueOf(operation), stackTraceToSingleLineString(t));
              ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(getName(), operation, stackTraceToSingleLineString(t));
          logger.error(message);

          // Ensure that the client receives some kind of result so that it does
@@ -200,12 +199,10 @@

        try
        {
          LocalizableMessage message = ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(getName(),
                                      String.valueOf(operation),
                                      stackTraceToSingleLineString(t));
          LocalizableMessage message = ERR_UNCAUGHT_WORKER_THREAD_EXCEPTION.get(
              getName(), operation, stackTraceToSingleLineString(t));

          operation.disconnectClient(DisconnectReason.SERVER_ERROR,
                                     true, message);
          operation.disconnectClient(DisconnectReason.SERVER_ERROR, true, message);
        }
        catch (Throwable t2)
        {

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

@@ -146,10 +146,8 @@
        {
          if (targetDN != null)
          {
            LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_MULTIPLE_TARGETS.get(
                String.valueOf(groupEntry.getName()));
            throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION,
                                         message);
            LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_MULTIPLE_TARGETS.get(groupEntry.getName());
            throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
          }

          try
@@ -171,8 +169,7 @@

    if (targetDN == null)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET.get(
          String.valueOf(groupEntry.getName()));
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET.get(groupEntry.getName());
      throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION, message);
    }

@@ -315,15 +312,12 @@
         DirectoryServer.getGroupManager().getGroupInstance(targetGroupDN);
    if (targetGroup == null)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(
          String.valueOf(targetGroupDN), String.valueOf(groupEntryDN));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(targetGroupDN, groupEntryDN);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
    }
    else if (targetGroup instanceof VirtualStaticGroup)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_TARGET_CANNOT_BE_VIRTUAL.get(
          String.valueOf(groupEntryDN), String.valueOf(targetGroupDN));
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_TARGET_CANNOT_BE_VIRTUAL.get(groupEntryDN, targetGroupDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }
    else
@@ -350,15 +344,12 @@
         DirectoryServer.getGroupManager().getGroupInstance(targetGroupDN);
    if (targetGroup == null)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(
          String.valueOf(targetGroupDN), String.valueOf(groupEntryDN));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(targetGroupDN, groupEntryDN);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
    }
    else if (targetGroup instanceof VirtualStaticGroup)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_TARGET_CANNOT_BE_VIRTUAL.get(
          String.valueOf(groupEntryDN), String.valueOf(targetGroupDN));
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_TARGET_CANNOT_BE_VIRTUAL.get(groupEntryDN, targetGroupDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }
    else
@@ -380,15 +371,12 @@
         DirectoryServer.getGroupManager().getGroupInstance(targetGroupDN);
    if (targetGroup == null)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(
          String.valueOf(targetGroupDN), String.valueOf(groupEntryDN));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(targetGroupDN, groupEntryDN);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
    }
    else if (targetGroup instanceof VirtualStaticGroup)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_TARGET_CANNOT_BE_VIRTUAL.get(
          String.valueOf(groupEntryDN), String.valueOf(targetGroupDN));
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_TARGET_CANNOT_BE_VIRTUAL.get(groupEntryDN, targetGroupDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }
    else
@@ -411,15 +399,12 @@
         DirectoryServer.getGroupManager().getGroupInstance(targetGroupDN);
    if (targetGroup == null)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(
          String.valueOf(targetGroupDN), String.valueOf(groupEntryDN));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_NO_TARGET_GROUP.get(targetGroupDN, groupEntryDN);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
    }
    else if (targetGroup instanceof VirtualStaticGroup)
    {
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_TARGET_CANNOT_BE_VIRTUAL.get(
          String.valueOf(groupEntryDN), String.valueOf(targetGroupDN));
      LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_TARGET_CANNOT_BE_VIRTUAL.get(groupEntryDN, targetGroupDN);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }
    else
@@ -449,8 +434,7 @@
         throws UnsupportedOperationException, DirectoryException
  {
    // Virtual static groups don't support altering the member list.
    LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_ALTERING_MEMBERS_NOT_SUPPORTED.
        get(String.valueOf(groupEntryDN));
    LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_ALTERING_MEMBERS_NOT_SUPPORTED.get(groupEntryDN);
    throw new UnsupportedOperationException(message.toString());
  }

@@ -464,8 +448,7 @@
         throws UnsupportedOperationException, DirectoryException
  {
    // Virtual static groups don't support altering the member list.
    LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_ALTERING_MEMBERS_NOT_SUPPORTED.
        get(String.valueOf(groupEntryDN));
    LocalizableMessage message = ERR_VIRTUAL_STATIC_GROUP_ALTERING_MEMBERS_NOT_SUPPORTED.get(groupEntryDN);
    throw new UnsupportedOperationException(message.toString());
  }


 opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java

@@ -340,8 +340,7 @@
    }
    catch (final Exception e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_INVALID_TIME_FORMAT.get(String
          .valueOf(formatString));
      final LocalizableMessage message = ERR_CONFIG_LOGGING_INVALID_TIME_FORMAT.get(formatString);
      unacceptableReasons.add(message);
      return false;
    }
@@ -361,9 +360,7 @@
    }
    catch (final DirectoryException e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_MODE_INVALID.get(
          config.getLogFilePermissions(), String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_CONFIG_LOGGING_MODE_INVALID.get(config.getLogFilePermissions(), e));
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java

@@ -281,9 +281,7 @@
    }
    catch (DirectoryException e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_MODE_INVALID.get(config
          .getLogFilePermissions(), String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_CONFIG_LOGGING_MODE_INVALID.get(config.getLogFilePermissions(), e));
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java

@@ -234,9 +234,7 @@
    }
    catch(DirectoryException e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_MODE_INVALID.get(
          config.getLogFilePermissions(), String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_CONFIG_LOGGING_MODE_INVALID.get(config.getLogFilePermissions(), e));
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java

@@ -318,9 +318,7 @@
    }
    catch(DirectoryException e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_MODE_INVALID.get(
          config.getLogFilePermissions(), String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_CONFIG_LOGGING_MODE_INVALID.get(config.getLogFilePermissions(), e));
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java

@@ -404,9 +404,7 @@
    }
    catch (final Exception e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_INVALID_TIME_FORMAT.get(String
          .valueOf(formatString));
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_CONFIG_LOGGING_INVALID_TIME_FORMAT.get(formatString));
      return false;
    }

@@ -425,9 +423,7 @@
    }
    catch (final DirectoryException e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_MODE_INVALID.get(
          config.getLogFilePermissions(), String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_CONFIG_LOGGING_MODE_INVALID.get(config.getLogFilePermissions(), e));
      return false;
    }


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

@@ -251,9 +251,7 @@
      case PRE_PARSE_MODIFY:
        break;
      default:
        final LocalizableMessage message = ERR_PLUGIN_ATTR_CLEANUP_INITIALIZE_PLUGIN
            .get(String.valueOf(t));
        throw new ConfigException(message);
        throw new ConfigException(ERR_PLUGIN_ATTR_CLEANUP_INITIALIZE_PLUGIN.get(t));
      }
    }


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

@@ -176,9 +176,7 @@
    // The set of plugin types must contain only the pre-parse search element.
    if (pluginTypes.isEmpty())
    {
      LocalizableMessage message = ERR_PLUGIN_ADLIST_NO_PLUGIN_TYPES.get(
          String.valueOf(configuration.dn()));
      throw new ConfigException(message);
      throw new ConfigException(ERR_PLUGIN_ADLIST_NO_PLUGIN_TYPES.get(configuration.dn()));
    }
    else
    {
@@ -186,9 +184,7 @@
      {
        if (t != PluginType.PRE_PARSE_SEARCH)
        {
          LocalizableMessage message = ERR_PLUGIN_ADLIST_INVALID_PLUGIN_TYPE.get(
              String.valueOf(configuration.dn()), String.valueOf(t));
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_ADLIST_INVALID_PLUGIN_TYPE.get(configuration.dn(), t));
        }
      }
    }
@@ -259,10 +255,7 @@


        default:
          LocalizableMessage message = ERR_PLUGIN_ADLIST_INVALID_PLUGIN_TYPE.get(
                  String.valueOf(configuration.dn()),
                  String.valueOf(pluginType));
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_ADLIST_INVALID_PLUGIN_TYPE.get(configuration.dn(), pluginType));
          configAcceptable = false;
      }
    }

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

@@ -182,17 +182,11 @@
             DirectoryServer.getPasswordStorageScheme(schemeDN);
        if (defaultAuthPasswordSchemes[i] == null)
        {
          LocalizableMessage message =
              ERR_PLUGIN_PWIMPORT_NO_SUCH_DEFAULT_AUTH_SCHEME.get(
                   String.valueOf(schemeDN));
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_PWIMPORT_NO_SUCH_DEFAULT_AUTH_SCHEME.get(schemeDN));
        }
        else if (! defaultAuthPasswordSchemes[i].supportsAuthPasswordSyntax())
        {
          LocalizableMessage message =
              ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_AUTH_SCHEME.get(
                   String.valueOf(schemeDN));
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_AUTH_SCHEME.get(schemeDN));
        }
        i++;
      }
@@ -238,10 +232,7 @@
             DirectoryServer.getPasswordStorageScheme(schemeDN);
        if (defaultUserPasswordSchemes[i] == null)
        {
          LocalizableMessage message =
              ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_USER_SCHEME.get(
                   String.valueOf(schemeDN));
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_USER_SCHEME.get(schemeDN));
        }
        i++;
      }
@@ -657,18 +648,12 @@
             DirectoryServer.getPasswordStorageScheme(schemeDN);
        if (defaultAuthSchemes[i] == null)
        {
          LocalizableMessage message =
              ERR_PLUGIN_PWIMPORT_NO_SUCH_DEFAULT_AUTH_SCHEME.get(
                   String.valueOf(schemeDN));
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_PWIMPORT_NO_SUCH_DEFAULT_AUTH_SCHEME.get(schemeDN));
          configAcceptable = false;
        }
        else if (! defaultAuthSchemes[i].supportsAuthPasswordSyntax())
        {
          LocalizableMessage message =
              ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_AUTH_SCHEME.get(
                   String.valueOf(schemeDN));
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_AUTH_SCHEME.get(schemeDN));
          configAcceptable = false;
        }
        i++;
@@ -706,9 +691,7 @@
             DirectoryServer.getPasswordStorageScheme(schemeDN);
        if (defaultUserSchemes[i] == null)
        {
          LocalizableMessage message = ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_USER_SCHEME.get(
                                 String.valueOf(schemeDN));
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_USER_SCHEME.get(schemeDN));
          configAcceptable = false;
        }
        i++;
@@ -774,18 +757,12 @@
        if (defaultAuthSchemes[i] == null)
        {
          resultCode = DirectoryServer.getServerErrorResultCode();

          messages.add(
               ERR_PLUGIN_PWIMPORT_NO_SUCH_DEFAULT_AUTH_SCHEME.get(
                    String.valueOf(schemeDN)));
          messages.add(ERR_PLUGIN_PWIMPORT_NO_SUCH_DEFAULT_AUTH_SCHEME.get(schemeDN));
        }
        else if (! defaultAuthSchemes[i].supportsAuthPasswordSyntax())
        {
          resultCode = DirectoryServer.getServerErrorResultCode();

          messages.add(
               ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_AUTH_SCHEME.get(
                    String.valueOf(schemeDN)));
          messages.add(ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_AUTH_SCHEME.get(schemeDN));
        }
        i++;
      }
@@ -832,9 +809,7 @@
        if (defaultUserSchemes[i] == null)
        {
          resultCode = DirectoryServer.getServerErrorResultCode();

          messages.add(ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_USER_SCHEME.get(
                            String.valueOf(schemeDN)));
          messages.add(ERR_PLUGIN_PWIMPORT_INVALID_DEFAULT_USER_SCHEME.get(schemeDN));
        }
        i++;
      }

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

@@ -716,9 +716,7 @@
        return;

      default:
        LocalizableMessage message1 = ERR_PLUGIN_REFERENT_SEARCH_FAILED.
                get(String.valueOf(operation.getErrorMessage()));
        logger.error(message1);
        logger.error(ERR_PLUGIN_REFERENT_SEARCH_FAILED.get(operation.getErrorMessage()));
        return;
    }

@@ -812,8 +810,7 @@
            conn.processModify(entryDN, mods);
    if(modifyOperation.getResultCode() != ResultCode.SUCCESS)
    {
      logger.error(ERR_PLUGIN_REFERENT_MODIFY_FAILED.get(entryDN,
                      String.valueOf(modifyOperation.getErrorMessage())));
      logger.error(ERR_PLUGIN_REFERENT_MODIFY_FAILED.get(entryDN, modifyOperation.getErrorMessage()));
    }
  }


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

@@ -945,8 +945,7 @@
      case POSTOPERATIONEXTENDED:
        break;
      default:
        messages.add(ERR_PLUGIN_SAMBA_SYNC_INVALID_PLUGIN_TYPE.get(String
            .valueOf(t)));
        messages.add(ERR_PLUGIN_SAMBA_SYNC_INVALID_PLUGIN_TYPE.get(t));
        return false;
      }
    }

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

@@ -143,9 +143,7 @@
    // Make sure that this plugin is only registered as a startup plugin.
    if (pluginTypes.isEmpty())
    {
      LocalizableMessage message = ERR_PLUGIN_PROFILER_NO_PLUGIN_TYPES.get(
          String.valueOf(configEntryDN));
      throw new ConfigException(message);
      throw new ConfigException(ERR_PLUGIN_PROFILER_NO_PLUGIN_TYPES.get(configEntryDN));
    }
    else
    {
@@ -153,9 +151,7 @@
      {
        if (t != PluginType.STARTUP)
        {
          LocalizableMessage message = ERR_PLUGIN_PROFILER_INVALID_PLUGIN_TYPE.get(
              String.valueOf(configEntryDN), String.valueOf(t));
          throw new ConfigException(message);
          throw new ConfigException(ERR_PLUGIN_PROFILER_INVALID_PLUGIN_TYPE.get(configEntryDN, t));
        }
      }
    }
@@ -166,7 +162,7 @@
    if (! (profileDirectory.exists() && profileDirectory.isDirectory()))
    {
      LocalizableMessage message = WARN_PLUGIN_PROFILER_INVALID_PROFILE_DIR.get(
          profileDirectory.getAbsolutePath(), String.valueOf(configEntryDN));
          profileDirectory.getAbsolutePath(), configEntryDN);
      throw new ConfigException(message);
    }
  }
@@ -254,9 +250,7 @@
    // Make sure that the plugin is only registered as a startup plugin.
    if (configuration.getPluginType().isEmpty())
    {
      LocalizableMessage message = ERR_PLUGIN_PROFILER_NO_PLUGIN_TYPES.get(
              String.valueOf(cfgEntryDN));
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_PLUGIN_PROFILER_NO_PLUGIN_TYPES.get(cfgEntryDN));
      configAcceptable = false;
    }
    else
@@ -265,10 +259,7 @@
      {
        if (t != PluginCfgDefn.PluginType.STARTUP)
        {
          LocalizableMessage message = ERR_PLUGIN_PROFILER_INVALID_PLUGIN_TYPE.get(
                  String.valueOf(cfgEntryDN),
                                      String.valueOf(t));
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_PROFILER_INVALID_PLUGIN_TYPE.get(cfgEntryDN, t));
          configAcceptable = false;
          break;
        }
@@ -281,8 +272,7 @@
    if (! (profileDirectory.exists() && profileDirectory.isDirectory()))
    {
      unacceptableReasons.add(WARN_PLUGIN_PROFILER_INVALID_PROFILE_DIR.get(
              profileDirectory.getAbsolutePath(),
              String.valueOf(cfgEntryDN)));
          profileDirectory.getAbsolutePath(), cfgEntryDN));
      configAcceptable = false;
    }

@@ -322,13 +312,11 @@
                 new ProfilerThread(configuration.getProfileSampleInterval());
            profilerThread.start();

            messages.add(INFO_PLUGIN_PROFILER_STARTED_PROFILING.get(
                    String.valueOf(configEntryDN)));
            messages.add(INFO_PLUGIN_PROFILER_STARTED_PROFILING.get(configEntryDN));
          }
          else
          {
            messages.add(INFO_PLUGIN_PROFILER_ALREADY_PROFILING.get(
                    String.valueOf(configEntryDN)));
            messages.add(INFO_PLUGIN_PROFILER_ALREADY_PROFILING.get(configEntryDN));
          }
        }
        break;
@@ -340,15 +328,13 @@
        {
          if (profilerThread == null)
          {
            messages.add(INFO_PLUGIN_PROFILER_NOT_RUNNING.get(
                    String.valueOf(configEntryDN)));
            messages.add(INFO_PLUGIN_PROFILER_NOT_RUNNING.get(configEntryDN));
          }
          else
          {
            profilerThread.stopProfiling();

            messages.add(INFO_PLUGIN_PROFILER_STOPPED_PROFILING.get(
                    String.valueOf(configEntryDN)));
            messages.add(INFO_PLUGIN_PROFILER_STOPPED_PROFILING.get(configEntryDN));

            String filename =
                 getFileForPath(
@@ -359,17 +345,13 @@
            {
              profilerThread.writeCaptureData(filename);

              messages.add(INFO_PLUGIN_PROFILER_WROTE_PROFILE_DATA.get(
                      String.valueOf(configEntryDN),
                      filename));
              messages.add(INFO_PLUGIN_PROFILER_WROTE_PROFILE_DATA.get(configEntryDN, filename));
            }
            catch (Exception e)
            {
              logger.traceException(e);

              messages.add(ERR_PLUGIN_PROFILER_CANNOT_WRITE_PROFILE_DATA.get(
                      String.valueOf(configEntryDN),
                      filename,
              messages.add(ERR_PLUGIN_PROFILER_CANNOT_WRITE_PROFILE_DATA.get(configEntryDN, filename,
                      stackTraceToSingleLineString(e)));

              resultCode = DirectoryConfig.getServerErrorResultCode();
@@ -387,15 +369,13 @@
        {
          if (profilerThread == null)
          {
            messages.add(INFO_PLUGIN_PROFILER_NOT_RUNNING.get(
                    String.valueOf(configEntryDN)));
            messages.add(INFO_PLUGIN_PROFILER_NOT_RUNNING.get(configEntryDN));
          }
          else
          {
            profilerThread.stopProfiling();

            messages.add(INFO_PLUGIN_PROFILER_STOPPED_PROFILING.get(
                    String.valueOf(configEntryDN)));
            messages.add(INFO_PLUGIN_PROFILER_STOPPED_PROFILING.get(configEntryDN));

            profilerThread = null;
          }

 opendj3-server-dev/src/server/org/opends/server/protocols/http/HTTPConnectionHandler.java

@@ -597,8 +597,7 @@
      catch (IOException e)
      {
        logger.traceException(e);
        return ERR_CONNHANDLER_CANNOT_BIND.get("HTTP", String
            .valueOf(configEntryDN), a.getHostAddress(), listenPort,
        return ERR_CONNHANDLER_CANNOT_BIND.get("HTTP", configEntryDN, a.getHostAddress(), listenPort,
            getExceptionMessage(e));
      }
    }
@@ -725,7 +724,7 @@
        logger.traceException(e);

        logger.error(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(friendlyName,
            String.valueOf(currentConfig.dn()), getExceptionMessage(e)));
            currentConfig.dn(), getExceptionMessage(e)));

        if (lastIterationFailed)
        {
@@ -735,8 +734,7 @@
          // log an error.
          LocalizableMessage message =
              ERR_CONNHANDLER_CONSECUTIVE_ACCEPT_FAILURES.get(friendlyName,
                  String.valueOf(currentConfig.dn()),
                  stackTraceToSingleLineString(e));
                  currentConfig.dn(), stackTraceToSingleLineString(e));
          logger.error(message);

          DirectoryServer.sendAlertNotification(this,

 opendj3-server-dev/src/server/org/opends/server/protocols/internal/InternalClientConnection.java

@@ -288,7 +288,7 @@
    if (userEntry == null)
    {
      LocalizableMessage m =
           ERR_INTERNALCONN_NO_SUCH_USER.get(String.valueOf(userDN));
           ERR_INTERNALCONN_NO_SUCH_USER.get(userDN);
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m);
    }


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

@@ -788,8 +788,7 @@
          referralsStr.append(iterator.next());
        }

        errorMessage.append(ERR_LDAPV2_REFERRALS_OMITTED.get(String
            .valueOf(referralsStr)));
        errorMessage.append(ERR_LDAPV2_REFERRALS_OMITTED.get(referralsStr));
      }
    }
    else
@@ -827,8 +826,8 @@
      // If this an LDAPv2 client, then we can't send this.
      if (ldapVersion == 2)
      {
        logger.error(ERR_LDAPV2_SKIPPING_EXTENDED_RESPONSE.get(getConnectionID(), operation.getOperationID(), String
                .valueOf(operation)));
        logger.error(ERR_LDAPV2_SKIPPING_EXTENDED_RESPONSE.get(
            getConnectionID(), operation.getOperationID(), operation));
        return null;
      }

@@ -856,9 +855,8 @@
    default:
      // This must be a type of operation that doesn't have a response.
      // This shouldn't happen, so log a message and return.
      logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_INVALID_OP.get(String
          .valueOf(operation.getOperationType()), getConnectionID(),
          operation.getOperationID(), String.valueOf(operation)));
      logger.error(ERR_LDAP_CLIENT_SEND_RESPONSE_INVALID_OP.get(operation.getOperationType(), getConnectionID(),
          operation.getOperationID(), operation));
      return null;
    }

@@ -1586,8 +1584,7 @@
      {
        // The connection failed, but there was an unread partial message so
        // interpret this as an IO error.
        LocalizableMessage m = ERR_LDAP_CLIENT_IO_ERROR_DURING_READ.get(String
            .valueOf(e));
        LocalizableMessage m = ERR_LDAP_CLIENT_IO_ERROR_DURING_READ.get(e);
        disconnect(DisconnectReason.IO_ERROR, true, m);
      }
      else
@@ -1723,8 +1720,7 @@

      LocalizableMessage msg =
          ERR_LDAP_DISCONNECT_DUE_TO_PROCESSING_FAILURE.get(message
              .getProtocolOpName(), message.getMessageID(), String
              .valueOf(e));
              .getProtocolOpName(), message.getMessageID(), e);
      disconnect(DisconnectReason.SERVER_ERROR, true, msg);
      return false;
    }
@@ -1936,7 +1932,7 @@
      // request must result in terminating the connection.
      LocalizableMessage msg =
          ERR_LDAP_INVALID_BIND_AUTH_TYPE.get(message.getMessageID(),
              String.valueOf(protocolOp.getAuthenticationType()));
              protocolOp.getAuthenticationType());
      disconnect(DisconnectReason.PROTOCOL_ERROR, true, msg);
      return false;
    }

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

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

      LocalizableMessage message = ERR_LDAP_CONNHANDLER_OPEN_SELECTOR_FAILED.get(
          String.valueOf(config.dn()), stackTraceToSingleLineString(e));
          config.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }

@@ -863,8 +863,7 @@
      catch (IOException e)
      {
        logger.traceException(e);
        return ERR_CONNHANDLER_CANNOT_BIND.get("LDAP", String
            .valueOf(configEntryDN), a.getHostAddress(), listenPort,
        return ERR_CONNHANDLER_CANNOT_BIND.get("LDAP", configEntryDN, a.getHostAddress(), listenPort,
            getExceptionMessage(e));
      }
    }
@@ -1004,8 +1003,7 @@
        // administrative action before trying again.
        if (numRegistered == 0)
        {
          logger.error(ERR_LDAP_CONNHANDLER_NO_ACCEPTORS.get(String
              .valueOf(currentConfig.dn())));
          logger.error(ERR_LDAP_CONNHANDLER_NO_ACCEPTORS.get(currentConfig.dn()));

          enabled = false;
          continue;
@@ -1029,7 +1027,7 @@
            logger.traceException(e);

            logger.error(ERR_CONNHANDLER_CANNOT_ACCEPT_CONNECTION.get(friendlyName,
                String.valueOf(currentConfig.dn()), getExceptionMessage(e)));
                currentConfig.dn(), getExceptionMessage(e)));

            if (lastIterationFailed)
            {
@@ -1039,8 +1037,7 @@
              // log an error.
              LocalizableMessage message =
                  ERR_CONNHANDLER_CONSECUTIVE_ACCEPT_FAILURES.get(friendlyName,
                      String.valueOf(currentConfig.dn()),
                      stackTraceToSingleLineString(e));
                      currentConfig.dn(), stackTraceToSingleLineString(e));
              logger.error(message);

              DirectoryServer.sendAlertNotification(this,
@@ -1075,8 +1072,7 @@
        // and disable the selector until an administrator can figure
        // out what's going on.
        LocalizableMessage message =
            ERR_LDAP_CONNHANDLER_UNCAUGHT_ERROR.get(String
                .valueOf(currentConfig.dn()), stackTraceToSingleLineString(e));
            ERR_LDAP_CONNHANDLER_UNCAUGHT_ERROR.get(currentConfig.dn(), stackTraceToSingleLineString(e));
        logger.error(message);

        DirectoryServer.sendAlertNotification(this,
@@ -1160,8 +1156,7 @@
      {
        logger.traceException(e);

        logger.error(ERR_LDAP_CONNHANDLER_CREATE_CHANNEL_FAILED.get(String
            .valueOf(currentConfig.dn()), a.getHostAddress(), listenPort,
        logger.error(ERR_LDAP_CONNHANDLER_CREATE_CHANNEL_FAILED.get(currentConfig.dn(), a.getHostAddress(), listenPort,
            stackTraceToSingleLineString(e)));
      }
    }

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

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

      LocalizableMessage message = ERR_LDAP_FILTER_UNCAUGHT_EXCEPTION.get(
          filterString, String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_UNCAUGHT_EXCEPTION.get(filterString, e);
      throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message, e);
    }
  }
@@ -536,7 +535,7 @@
          // clause to reject them.
        default:
          LocalizableMessage message = ERR_LDAP_FILTER_INVALID_CHAR_IN_ATTR_TYPE.get(
              attrType, String.valueOf(attrType.charAt(i)), i);
              attrType, attrType.charAt(i), i);
          throw new LDAPException(LDAPResultCode.PROTOCOL_ERROR, message);
      }
    }

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

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

      LocalizableMessage message =
          ERR_LDAP_MESSAGE_DECODE_MESSAGE_ID.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MESSAGE_DECODE_MESSAGE_ID.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -95,8 +94,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MESSAGE_DECODE_PROTOCOL_OP.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MESSAGE_DECODE_PROTOCOL_OP.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -112,8 +110,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MESSAGE_DECODE_CONTROLS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MESSAGE_DECODE_CONTROLS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -287,8 +284,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_ABANDON_REQUEST_DECODE_ID.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_ABANDON_REQUEST_DECODE_ID.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -317,8 +313,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_ADD_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_ADD_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_ADD_REQUEST_DECODE_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_ADD_REQUEST_DECODE_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -353,8 +348,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_ADD_REQUEST_DECODE_ATTRS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_ADD_REQUEST_DECODE_ATTRS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -366,8 +360,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_ADD_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_ADD_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -410,8 +403,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -433,8 +425,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -452,8 +443,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -477,8 +467,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_REFERRALS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_REFERRALS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -520,8 +509,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_BIND_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_BIND_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -534,8 +522,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_BIND_REQUEST_DECODE_VERSION.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_BIND_REQUEST_DECODE_VERSION.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_BIND_REQUEST_DECODE_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_BIND_REQUEST_DECODE_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -563,8 +550,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_BIND_REQUEST_DECODE_CREDENTIALS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_BIND_REQUEST_DECODE_CREDENTIALS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -581,8 +567,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message =
              ERR_LDAP_BIND_REQUEST_DECODE_PASSWORD.get(String.valueOf(e));
          LocalizableMessage message = ERR_LDAP_BIND_REQUEST_DECODE_PASSWORD.get(e);
          throw new LDAPException(PROTOCOL_ERROR, message, e);
        }
        break;
@@ -600,8 +585,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message =
              ERR_LDAP_BIND_REQUEST_DECODE_SASL_INFO.get(String.valueOf(e));
          LocalizableMessage message = ERR_LDAP_BIND_REQUEST_DECODE_SASL_INFO.get(e);
          throw new LDAPException(PROTOCOL_ERROR, message, e);
        }
        break;
@@ -619,8 +603,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_BIND_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_BIND_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -669,8 +652,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -692,8 +674,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -711,8 +692,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -741,8 +721,7 @@
        {
          logger.traceException(e);

          LocalizableMessage message =
              ERR_LDAP_RESULT_DECODE_REFERRALS.get(String.valueOf(e));
          LocalizableMessage message = ERR_LDAP_RESULT_DECODE_REFERRALS.get(e);
          throw new LDAPException(PROTOCOL_ERROR, message, e);
        }
      }
@@ -758,9 +737,7 @@
        {
          logger.traceException(e);

          LocalizableMessage message =
              ERR_LDAP_BIND_RESULT_DECODE_SERVER_SASL_CREDENTIALS.
                  get(String.valueOf(e));
          LocalizableMessage message = ERR_LDAP_BIND_RESULT_DECODE_SERVER_SASL_CREDENTIALS.get(e);
          throw new LDAPException(PROTOCOL_ERROR, message, e);
        }
      }
@@ -778,7 +755,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -808,8 +785,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_COMPARE_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_COMPARE_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -823,8 +799,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_COMPARE_REQUEST_DECODE_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_COMPARE_REQUEST_DECODE_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -836,8 +811,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_COMPARE_REQUEST_DECODE_AVA.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_COMPARE_REQUEST_DECODE_AVA.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -850,8 +824,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_COMPARE_REQUEST_DECODE_TYPE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_COMPARE_REQUEST_DECODE_TYPE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -865,8 +838,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_COMPARE_REQUEST_DECODE_VALUE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_COMPARE_REQUEST_DECODE_VALUE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -878,8 +850,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_COMPARE_REQUEST_DECODE_AVA.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_COMPARE_REQUEST_DECODE_AVA.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -891,8 +862,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_COMPARE_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_COMPARE_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -935,8 +905,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -958,8 +927,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -977,8 +945,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1002,8 +969,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_REFERRALS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_REFERRALS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1045,8 +1011,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_DELETE_REQUEST_DECODE_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_DELETE_REQUEST_DECODE_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }
  }
@@ -1072,7 +1037,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1085,8 +1050,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1108,8 +1072,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1127,8 +1090,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1152,8 +1114,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_REFERRALS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_REFERRALS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1198,8 +1159,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_EXTENDED_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_EXTENDED_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1213,8 +1173,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_EXTENDED_REQUEST_DECODE_OID.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_EXTENDED_REQUEST_DECODE_OID.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1231,8 +1190,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_EXTENDED_REQUEST_DECODE_VALUE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_EXTENDED_REQUEST_DECODE_VALUE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1244,8 +1202,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_EXTENDED_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_EXTENDED_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1288,8 +1245,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1311,8 +1267,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1330,8 +1285,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1359,8 +1313,7 @@
        {
          logger.traceException(e);

          LocalizableMessage message =
              ERR_LDAP_RESULT_DECODE_REFERRALS.get(String.valueOf(e));
          LocalizableMessage message = ERR_LDAP_RESULT_DECODE_REFERRALS.get(e);
          throw new LDAPException(PROTOCOL_ERROR, message, e);
        }
      }
@@ -1375,8 +1328,7 @@
        {
          logger.traceException(e);

          LocalizableMessage message =
              ERR_LDAP_EXTENDED_RESULT_DECODE_OID.get(String.valueOf(e));
          LocalizableMessage message = ERR_LDAP_EXTENDED_RESULT_DECODE_OID.get(e);
          throw new LDAPException(PROTOCOL_ERROR, message, e);
        }
      }
@@ -1391,8 +1343,7 @@
        {
          logger.traceException(e);

          LocalizableMessage message =
              ERR_LDAP_EXTENDED_RESULT_DECODE_VALUE.get(String.valueOf(e));
          LocalizableMessage message = ERR_LDAP_EXTENDED_RESULT_DECODE_VALUE.get(e);
          throw new LDAPException(PROTOCOL_ERROR, message, e);
        }
      }
@@ -1410,7 +1361,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1442,8 +1393,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_INTERMEDIATE_RESPONSE_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_INTERMEDIATE_RESPONSE_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1503,8 +1453,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_INTERMEDIATE_RESPONSE_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_INTERMEDIATE_RESPONSE_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1535,8 +1484,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MODIFY_DN_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_DN_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1550,8 +1498,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MODIFY_DN_REQUEST_DECODE_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_DN_REQUEST_DECODE_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1565,8 +1512,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MODIFY_DN_REQUEST_DECODE_NEW_RDN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_DN_REQUEST_DECODE_NEW_RDN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1580,8 +1526,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_MODIFY_DN_REQUEST_DECODE_DELETE_OLD_RDN.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_DN_REQUEST_DECODE_DELETE_OLD_RDN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1598,8 +1543,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_MODIFY_DN_REQUEST_DECODE_NEW_SUPERIOR.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_DN_REQUEST_DECODE_NEW_SUPERIOR.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1611,8 +1555,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MODIFY_DN_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_DN_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1656,8 +1599,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1679,8 +1621,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1698,8 +1639,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1723,8 +1663,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_REFERRALS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_REFERRALS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1767,8 +1706,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MODIFY_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1781,8 +1719,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MODIFY_REQUEST_DECODE_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_REQUEST_DECODE_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1803,8 +1740,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MODIFY_REQUEST_DECODE_MODS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_REQUEST_DECODE_MODS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1816,8 +1752,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MODIFY_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFY_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1861,8 +1796,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1884,8 +1818,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1903,8 +1836,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1928,8 +1860,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_REFERRALS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_REFERRALS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1972,8 +1903,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1986,8 +1916,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_BASE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_BASE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2024,8 +1953,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_SCOPE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_SCOPE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2062,8 +1990,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_DEREF.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_DEREF.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2077,8 +2004,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_SIZE_LIMIT.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_SIZE_LIMIT.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2092,8 +2018,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_TIME_LIMIT.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_TIME_LIMIT.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2107,8 +2032,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_TYPES_ONLY.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_TYPES_ONLY.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2121,8 +2045,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_FILTER.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_FILTER.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2142,8 +2065,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_ATTRIBUTES.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_ATTRIBUTES.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2155,8 +2077,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REQUEST_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REQUEST_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2201,8 +2122,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_RESULT_CODE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2224,8 +2144,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_MATCHED_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2243,8 +2162,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_ERROR_MESSAGE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2268,8 +2186,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_RESULT_DECODE_REFERRALS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_REFERRALS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_RESULT_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2313,8 +2230,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_ENTRY_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_ENTRY_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_SEARCH_ENTRY_DECODE_DN.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_ENTRY_DECODE_DN.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2349,8 +2265,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_ENTRY_DECODE_ATTRS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_ENTRY_DECODE_ATTRS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2362,8 +2277,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_ENTRY_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_ENTRY_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2395,8 +2309,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REFERENCE_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REFERENCE_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2415,8 +2328,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REFERENCE_DECODE_URLS.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REFERENCE_DECODE_URLS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2428,8 +2340,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_SEARCH_REFERENCE_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_SEARCH_REFERENCE_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_UNBIND_DECODE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_UNBIND_DECODE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }
  }
@@ -2492,8 +2403,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message =
          ERR_LDAP_CONTROL_DECODE_CONTROLS_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_CONTROL_DECODE_CONTROLS_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }
  }
@@ -2519,7 +2429,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_CONTROL_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_CONTROL_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

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

      LocalizableMessage message = ERR_LDAP_CONTROL_DECODE_OID.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_CONTROL_DECODE_OID.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -2552,8 +2462,7 @@
        {
          logger.traceException(e2);

          LocalizableMessage message =
              ERR_LDAP_CONTROL_DECODE_CRITICALITY.get(String.valueOf(e2));
          LocalizableMessage message = ERR_LDAP_CONTROL_DECODE_CRITICALITY.get(e2);
          throw new LDAPException(PROTOCOL_ERROR, message, e2);
        }
      }
@@ -2568,8 +2477,7 @@
        {
          logger.traceException(e2);

          LocalizableMessage message =
              ERR_LDAP_CONTROL_DECODE_VALUE.get(String.valueOf(e2));
          LocalizableMessage message = ERR_LDAP_CONTROL_DECODE_VALUE.get(e2);
          throw new LDAPException(PROTOCOL_ERROR, message, e2);
        }
      }
@@ -2587,7 +2495,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_CONTROL_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_CONTROL_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }


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

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

      LocalizableMessage message = ERR_LDAP_REQHANDLER_OPEN_SELECTOR_FAILED.get(
          handlerName, String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_REQHANDLER_OPEN_SELECTOR_FAILED.get(handlerName, e);
      throw new InitializationException(message, e);
    }

@@ -148,8 +147,7 @@
            (ste.getMethodName().indexOf("poll") >= 0) &&
            ioe.getMessage().equalsIgnoreCase("Invalid argument"))
        {
          LocalizableMessage message = ERR_LDAP_REQHANDLER_DETECTED_JVM_ISSUE_CR6322825.
              get(String.valueOf(ioe));
          LocalizableMessage message = ERR_LDAP_REQHANDLER_DETECTED_JVM_ISSUE_CR6322825.get(ioe);
          throw new InitializationException(message, ioe);
        }
      }
@@ -255,8 +253,7 @@
            logger.traceException(e);

            c.disconnect(DisconnectReason.SERVER_ERROR, true,
                ERR_LDAP_REQHANDLER_CANNOT_REGISTER.get(handlerName,
                    String.valueOf(e)));
                ERR_LDAP_REQHANDLER_CANNOT_REGISTER.get(handlerName, e));
          }
        }
      }

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

@@ -156,8 +156,7 @@
    // explicitly created and registered by the LDAP connection handler
    // or an LDAP client connection.
    LocalizableMessage message =
        ERR_LDAP_STATS_INVALID_MONITOR_INITIALIZATION.get(String
            .valueOf(configuration.dn()));
        ERR_LDAP_STATS_INVALID_MONITOR_INITIALIZATION.get(configuration.dn());
    throw new ConfigException(message);
  }


 opendj3-server-dev/src/server/org/opends/server/replication/plugin/HistoricalCsnOrderingMatchingRule.java

@@ -154,7 +154,7 @@
      // This should never occur in practice since these attributes are managed
      // internally.
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
          WARN_INVALID_SYNC_HIST_VALUE.get(String.valueOf(value)), e);
          WARN_INVALID_SYNC_HIST_VALUE.get(value), e);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -2491,8 +2491,7 @@
  private String logDecodingOperationError(LDAPUpdateMsg msg, Exception e)
  {
    LocalizableMessage message =
        ERR_EXCEPTION_DECODING_OPERATION.get(String.valueOf(msg) + " "
            + stackTraceToSingleLineString(e));
        ERR_EXCEPTION_DECODING_OPERATION.get(msg + " " + stackTraceToSingleLineString(e));
    logger.error(message);
    return message.toString();
  }
@@ -3542,8 +3541,7 @@
      if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
      {
        LocalizableMessage message =
            ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(backend.getBackendID(),
                String.valueOf(failureReason));
            ERR_LDIFEXPORT_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), failureReason);
        logger.error(message);
        throw new DirectoryException(ResultCode.OTHER, message);
      }
@@ -3644,8 +3642,7 @@
        if (! LockFileManager.releaseLock(lockFile, failureReason))
        {
          LocalizableMessage message =
              WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
                  String.valueOf(failureReason));
              WARN_LDIFEXPORT_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), failureReason);
          logger.warn(message);
          throw new DirectoryException(ResultCode.OTHER, message);
        }
@@ -3683,8 +3680,7 @@
    StringBuilder failureReason = new StringBuilder();
    if (! LockFileManager.acquireExclusiveLock(lockFile, failureReason))
    {
      LocalizableMessage message = ERR_INIT_CANNOT_LOCK_BACKEND.get(backend.getBackendID(),
          String.valueOf(failureReason));
      LocalizableMessage message = ERR_INIT_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), failureReason);
      logger.error(message);
      throw new DirectoryException(ResultCode.OTHER, message);
    }
@@ -3798,8 +3794,7 @@
    if (!LockFileManager.releaseLock(lockFile, failureReason))
    {
      LocalizableMessage message =
          WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(),
              String.valueOf(failureReason));
          WARN_LDIFIMPORT_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), failureReason);
      logger.warn(message);
      throw new DirectoryException(ResultCode.OTHER, message);
    }
@@ -3848,8 +3843,7 @@

    if (replicationDomain == null)
    {
      throw new DirectoryException(ResultCode.OTHER,
          ERR_NO_MATCHING_DOMAIN.get(String.valueOf(baseDN)));
      throw new DirectoryException(ResultCode.OTHER, ERR_NO_MATCHING_DOMAIN.get(baseDN));
    }
    return replicationDomain;
  }

 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java

@@ -462,10 +462,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
        ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER.get(String.valueOf(e));
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
          message, e);
      LocalizableMessage message = ERR_BACKEND_CANNOT_CREATE_LDIF_WRITER.get(e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message, e);
    }

    exportRootChanges(exportedDomains, exportConfig, ldifWriter);
@@ -588,7 +586,7 @@
      catch (Exception e)
      {
        logger.traceException(e);
        logger.error(ERR_BACKEND_EXPORT_ENTRY.get(dnString, String.valueOf(e)));
        logger.error(ERR_BACKEND_EXPORT_ENTRY.get(dnString, e));
      }
    }
  }
@@ -864,7 +862,7 @@
      LocalizableMessage message;
      if (isExport)
      {
        message = ERR_BACKEND_EXPORT_ENTRY.get(dnStr, String.valueOf(e));
        message = ERR_BACKEND_EXPORT_ENTRY.get(dnStr, e);
      }
      else
      {
@@ -1150,8 +1148,7 @@
        matchedDN = matchedDN.getParentDNInSuffix();
      }

      LocalizableMessage message = ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST.
        get(String.valueOf(searchBaseDN));
      LocalizableMessage message = ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST.get(searchBaseDN);
      throw new DirectoryException(
          ResultCode.NO_SUCH_OBJECT, message, matchedDN, null);
    }
@@ -1163,8 +1160,7 @@
      {
        if (!baseDNSet.contains(searchBaseDN))
        {
          LocalizableMessage message = ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST.get(
              String.valueOf(searchBaseDN));
          LocalizableMessage message = ERR_REPLICATIONBACKEND_ENTRY_DOESNT_EXIST.get(searchBaseDN);
          throw new DirectoryException(
              ResultCode.NO_SUCH_OBJECT, message, null, null);
        }

 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerHandler.java

@@ -259,7 +259,7 @@
    {
      logger.traceException(e);
      LocalizableMessage errMessage = ERR_RS_DISCONNECTED_DURING_HANDSHAKE.get(
          String.valueOf(getReplicationServerId()),
          getReplicationServerId(),
          session.getReadableRemoteAddress());
      abortStart(errMessage);
    }

 opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java

@@ -1858,9 +1858,7 @@
            if (++ieCtx.msgCnt != entryMsg.getMsgId())
            {
              ieCtx.setExceptionIfNoneSet(new DirectoryException(
                  ResultCode.OTHER, ERR_INIT_BAD_MSG_ID_SEQ_DURING_IMPORT.get(
                      String.valueOf(ieCtx.msgCnt),
                      String.valueOf(entryMsg.getMsgId()))));
                  ResultCode.OTHER, ERR_INIT_BAD_MSG_ID_SEQ_DURING_IMPORT.get(ieCtx.msgCnt, entryMsg.getMsgId())));
              return null;
            }

@@ -2424,8 +2422,7 @@
    ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
    if (newStatus == ServerStatus.INVALID_STATUS)
    {
      logger.error(ERR_DS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
          String.valueOf(getServerId()), status, event));
      logger.error(ERR_DS_CANNOT_CHANGE_STATUS.get(getBaseDN(), getServerId(), status, event));
      return;
    }

@@ -3222,9 +3219,7 @@
      }
      else if (getAssuredMode() != AssuredMode.SAFE_DATA_MODE)
      {
        logger.error(ERR_DS_UNKNOWN_ASSURED_MODE.get(String.valueOf(getServerId()),
            msg.getAssuredMode(), getBaseDNString(),
            msg));
        logger.error(ERR_DS_UNKNOWN_ASSURED_MODE, getServerId(), msg.getAssuredMode(), getBaseDN(), msg);
      }
        // Nothing to do in Assured safe data mode, only RS ack updates.
    }

 opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java

@@ -306,10 +306,8 @@
    char c = valueStr.charAt(pos++);
    if (c != '(')
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRTYPE_EXPECTED_OPEN_PARENTHESIS.get(
          valueStr, (pos-1), String.valueOf(c));
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRTYPE_EXPECTED_OPEN_PARENTHESIS.get(valueStr, (pos-1), c);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -361,10 +359,8 @@
        {
          // This must have been an illegal character.
          LocalizableMessage message =
            ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.
                get(valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
            ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.get(valueStr, c, pos - 1);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else
        {
@@ -389,10 +385,8 @@
        else
        {
          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_STRING_OID.
              get(valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_STRING_OID.get(valueStr, c, pos - 1);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
    }
@@ -526,11 +520,8 @@
        else
        {
          // This is an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR.get(
                      valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        //RFC 2251: A specification may also assign one or more textual names
        //for an attribute type.  These names MUST begin with a letter, and
@@ -628,10 +619,8 @@
          {
            // This is bad because we don't know what the superior attribute
            // type is so we can't base this attribute type on it.
            LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_SUPERIOR_TYPE.
                get(String.valueOf(oid), String.valueOf(woidBuffer));
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                         message);
            LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_SUPERIOR_TYPE.get(oid, woidBuffer);
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
          }
        }

@@ -667,10 +656,8 @@
        {
          // This is bad because we have no idea what the equality matching
          // rule should be.
          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_EQUALITY_MR.get(
              String.valueOf(oid), String.valueOf(woidBuffer));
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                       message);
          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_EQUALITY_MR.get(oid, woidBuffer);
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
        }
        else
        {
@@ -689,10 +676,8 @@
        {
          // This is bad because we have no idea what the ordering matching
          // rule should be.
          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_ORDERING_MR.get(
              String.valueOf(oid), String.valueOf(woidBuffer));
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                       message);
          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_ORDERING_MR.get(oid, woidBuffer);
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
        }
        else
        {
@@ -711,10 +696,8 @@
        {
          // This is bad because we have no idea what the substring matching
          // rule should be.
          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_SUBSTRING_MR.get(
              String.valueOf(oid), String.valueOf(woidBuffer));
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                       message);
          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_SUBSTRING_MR.get(oid, woidBuffer);
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
        }
        else
        {
@@ -746,8 +729,7 @@
                      &&  (c = lowerStr.charAt(pos)) != ')')
              {
                LocalizableMessage message =
                  ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.
                      get(valueStr, String.valueOf(c), (pos-1));
                  ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.get(valueStr, c, pos - 1);
                throw new DirectoryException(
                               ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
              }
@@ -757,8 +739,7 @@
            else if (! isDigit(c))
            {
              LocalizableMessage message =
                ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.
                    get(valueStr, String.valueOf(c), (pos-1));
                ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.get(valueStr, c, pos - 1);
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
            }
@@ -805,8 +786,7 @@
            else
            {
              LocalizableMessage message =
                ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.
                    get(valueStr, String.valueOf(c), (pos-1));
                ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.get(valueStr, c, pos - 1);
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
            }
@@ -816,8 +796,7 @@
        syntax = schema.getSyntax(oidBuffer.toString());
        if (syntax == null)
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_SYNTAX.get(
              String.valueOf(oid), String.valueOf(oidBuffer));
          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_SYNTAX.get(oid, oidBuffer);
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                       message);
        }
@@ -908,10 +887,8 @@
          // This must be an illegal usage.
          attributeUsage = AttributeUsage.USER_APPLICATIONS;

          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_INVALID_ATTRIBUTE_USAGE.
              get(String.valueOf(oid), usageStr);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_INVALID_ATTRIBUTE_USAGE.get(oid, usageStr);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
      else
@@ -937,8 +914,7 @@
      {
        // This is bad because we have no idea what the approximate matching
        // rule should be.
        LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_APPROXIMATE_MR.get(
            String.valueOf(oid), String.valueOf(ruleName));
        LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_APPROXIMATE_MR.get(oid, ruleName);
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
      }
      else
@@ -956,7 +932,7 @@
      if (superiorType.getUsage() != attributeUsage)
      {
        LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_INVALID_SUPERIOR_USAGE.get(
            oid, String.valueOf(attributeUsage), superiorType.getNameOrOID());
            oid, attributeUsage, superiorType.getNameOrOID());
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
      }

@@ -1102,10 +1078,8 @@
    // The next character must be a single quote.
    if (c != '\'')
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_EXPECTED_QUOTE_AT_POS.get(
          valueStr, startPos, String.valueOf(c));
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -1187,10 +1161,8 @@
    // The next character must be a single quote.
    if (c != '\'')
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_EXPECTED_QUOTE_AT_POS.get(
          valueStr, startPos, String.valueOf(c));
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = WARN_ATTR_SYNTAX_ATTRTYPE_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -1303,10 +1275,8 @@

          // This must have been an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.
                get(lowerStr, String.valueOf(c), (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_NUMERIC_OID.get(lowerStr, c, startPos-1);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else
        {
@@ -1340,20 +1310,16 @@
          }

          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_STRING_OID.
              get(lowerStr, String.valueOf(c), (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR_IN_STRING_OID.get(
              lowerStr, c, (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
    }
    else
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR.
                  get(lowerStr, String.valueOf(c), startPos);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_ATTRTYPE_ILLEGAL_CHAR.get(lowerStr, c, startPos);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }



 opendj3-server-dev/src/server/org/opends/server/schema/CollationMatchingRuleFactory.java

@@ -361,8 +361,7 @@
    catch (DirectoryException de)
    {
      LocalizableMessage message =
          WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR.get(String
              .valueOf(configuration.dn()), de.getMessageObject());
          WARN_CONFIG_SCHEMA_MR_CONFLICTING_MR.get(configuration.dn(), de.getMessageObject());
      adminActionRequired = true;
      messages.add(message);
    }

 opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java

@@ -278,10 +278,8 @@
    char c = valueStr.charAt(pos++);
    if (c != '(')
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_EXPECTED_OPEN_PARENTHESIS.get(
          valueStr, (pos-1), String.valueOf(c));
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_EXPECTED_OPEN_PARENTHESIS.get(valueStr, (pos-1), c);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -330,10 +328,8 @@
        else if (! isDigit(c))
        {
          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR_IN_NUMERIC_OID.get(
              valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR_IN_NUMERIC_OID.get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else
        {
@@ -355,10 +351,8 @@
        else
        {
          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR_IN_STRING_OID.get(
              valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR_IN_STRING_OID.get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
    }
@@ -399,7 +393,7 @@
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_STRUCTURAL_CLASS_NOT_STRUCTURAL.
          get(valueStr, oid, structuralClass.getNameOrOID(),
              String.valueOf(structuralClass.getObjectClassType()));
              structuralClass.getObjectClassType());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }

@@ -511,11 +505,8 @@
        else
        {
          // This is an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(
                      valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
      else if (lowerTokenName.equals("desc"))
@@ -589,10 +580,8 @@
            else if (c != '$')
            {
              LocalizableMessage message =
                  ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(
                          valueStr, String.valueOf(c), (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
                  ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
            }
          }
        }
@@ -676,10 +665,8 @@
            else if (c != '$')
            {
              LocalizableMessage message =
                  ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(
                          valueStr, String.valueOf(c), (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
                  ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
            }
          }
        }
@@ -757,10 +744,8 @@
            else if (c != '$')
            {
              LocalizableMessage message =
                  ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(
                          valueStr, String.valueOf(c), (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
                  ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
            }
          }
        }
@@ -839,10 +824,8 @@
            else if (c != '$')
            {
              LocalizableMessage message =
                  ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(
                          valueStr, String.valueOf(c), (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
                  ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
            }
          }
        }
@@ -1017,8 +1000,7 @@
    if (c != '\'')
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_DCR_EXPECTED_QUOTE_AT_POS.get(
                  valueStr, startPos, String.valueOf(c));
          ERR_ATTR_SYNTAX_DCR_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -1103,8 +1085,7 @@
    if (c != '\'')
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_DCR_EXPECTED_QUOTE_AT_POS.get(
                  valueStr, startPos, String.valueOf(c));
          ERR_ATTR_SYNTAX_DCR_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -1218,9 +1199,8 @@

          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR_IN_NUMERIC_OID.get(
              lowerStr, String.valueOf(c), (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              lowerStr, c, (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else
        {
@@ -1256,19 +1236,15 @@

          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR_IN_STRING_OID.get(
              lowerStr, String.valueOf(c), (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              lowerStr, c, (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
    }
    else
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(
                  lowerStr, String.valueOf(c), startPos);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(lowerStr, c, startPos);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -1378,10 +1354,8 @@
        {
          // This is an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(
                      valueStr, String.valueOf(c), startPos);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DCR_ILLEGAL_CHAR.get(valueStr, c, startPos);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else if (c == '\'')
        {

 opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java

@@ -280,9 +280,8 @@
    if (c != '(')
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_EXPECTED_OPEN_PARENTHESIS.get(
          valueStr, (pos-1), String.valueOf(c));
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
          valueStr, (pos-1), c);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -309,7 +308,7 @@
      if (! isDigit(c))
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR_IN_RULE_ID.get(
            valueStr, String.valueOf(c), (pos-1));
            valueStr, c, (pos-1));
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                     message);
      }
@@ -433,8 +432,7 @@
        {
          // This is an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR.get(
                      valueStr, String.valueOf(c), (pos-1));
              ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -501,7 +499,7 @@
              if (! isDigit(c))
              {
                LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR_IN_RULE_ID.
                    get(valueStr, String.valueOf(c), (pos-1));
                    get(valueStr, c, (pos-1));
                throw new DirectoryException(
                               ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
              }
@@ -595,8 +593,7 @@
          {
            if (! isDigit(c))
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR_IN_RULE_ID.get(
                  valueStr, String.valueOf(c), (pos-1));
              LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR_IN_RULE_ID.get(valueStr, c, (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
            }
@@ -779,8 +776,7 @@
    if (c != '\'')
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_DSR_EXPECTED_QUOTE_AT_POS.get(
                  valueStr, startPos, String.valueOf(c));
          ERR_ATTR_SYNTAX_DSR_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -865,8 +861,7 @@
    if (c != '\'')
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_DSR_EXPECTED_QUOTE_AT_POS.get(
                  valueStr, startPos, String.valueOf(c));
          ERR_ATTR_SYNTAX_DSR_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -979,10 +974,8 @@
          }

          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR_IN_NUMERIC_OID.get(
              lowerStr, String.valueOf(c), (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR_IN_NUMERIC_OID.get(lowerStr, c, (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else
        {
@@ -1017,20 +1010,15 @@
          }

          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR_IN_STRING_OID.get(
              lowerStr, String.valueOf(c), (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR_IN_STRING_OID.get(lowerStr, c, (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
    }
    else
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR.get(
                  lowerStr, String.valueOf(c), startPos);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR.get(lowerStr, c, startPos);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -1139,11 +1127,8 @@
        else if (c == '(')
        {
          // This is an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR.get(
                      valueStr, String.valueOf(c), startPos);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_ILLEGAL_CHAR.get(valueStr, c, startPos);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else if (c == '\'')
        {

 opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java

@@ -274,9 +274,7 @@
    char c = valueString.charAt(0);
    if (! PrintableString.isPrintableCharacter(c))
    {

      invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_NOT_PRINTABLE.get(
              valueString, String.valueOf(c), 0));
      invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_NOT_PRINTABLE.get(valueString, c, 0));
      return false;
    }

@@ -296,9 +294,7 @@
      {
        if (! PrintableString.isPrintableCharacter(c))
        {

          invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_NOT_PRINTABLE.get(
                  valueString, String.valueOf(c), pos));
          invalidReason.append(ERR_ATTR_SYNTAX_FAXNUMBER_NOT_PRINTABLE.get(valueString, c, pos));
        }
      }
    }

 opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java

@@ -480,9 +480,8 @@

        default:
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_YEAR.get(
              valueString, String.valueOf(valueString.charAt(i)));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              valueString, valueString.charAt(i));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      }
    }

@@ -932,10 +931,8 @@
        // be a digit between 0 and 9.
        if (length < 13)
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
              valueString, String.valueOf(m1), 10);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(valueString, m1, 10);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }


@@ -1011,18 +1008,14 @@

            // This should only happen if the provided date wasn't legal
            // (e.g., September 31).
            LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME.
                get(valueString, String.valueOf(e));
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message, e);
            LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME.get(valueString, e);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, e);
          }
        }
        else
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
              valueString, String.valueOf(m1), 10);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(valueString, m1, 10);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }

      case '+':
@@ -1047,17 +1040,14 @@
            // This should only happen if the provided date wasn't legal
            // (e.g., September 31).
            LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME.
                get(valueString, String.valueOf(e));
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message, e);
                get(valueString, e);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, e);
          }
        }
        else
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
              valueString, String.valueOf(m1), 10);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(valueString, m1, 10);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }

      case '.':
@@ -1066,10 +1056,8 @@
                                      minute, second, 3600000);

      default:
        LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
            valueString, String.valueOf(m1), 10);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                     message);
        LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(valueString, m1, 10);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -1090,10 +1078,8 @@
        // be a digit between 0 and 9.
        if (length < 15)
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
              valueString, String.valueOf(s1), 12);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(valueString, s1, 12);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }


@@ -1155,8 +1141,7 @@
        // a 0.
        if (length < 15)
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
              valueString, String.valueOf(s1), 12);
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(valueString, s1, 12);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -1193,15 +1178,14 @@
            // This should only happen if the provided date wasn't legal
            // (e.g., September 31).
            LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME.
                get(valueString, String.valueOf(e));
                get(valueString, e);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message, e);
          }
        }
        else
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
              valueString, String.valueOf(s1), 12);
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(valueString, s1, 12);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -1228,15 +1212,14 @@
            // This should only happen if the provided date wasn't legal
            // (e.g., September 31).
            LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME.
                get(valueString, String.valueOf(e));
                get(valueString, e);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message, e);
          }
        }
        else
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
              valueString, String.valueOf(s1), 12);
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(valueString, s1, 12);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -1247,8 +1230,7 @@
                                      minute, second, 60000);

      default:
        LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
            valueString, String.valueOf(s1), 12);
        LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(valueString, s1, 12);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                     message);
    }
@@ -1285,7 +1267,7 @@
            // This should only happen if the provided date wasn't legal
            // (e.g., September 31).
            LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME.
                get(valueString, String.valueOf(e));
                get(valueString, e);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message, e);
          }
@@ -1293,7 +1275,7 @@
        else
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
              valueString, String.valueOf(valueString.charAt(14)), 14);
              valueString, valueString.charAt(14), 14);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -1320,7 +1302,7 @@
            // This should only happen if the provided date wasn't legal
            // (e.g., September 31).
            LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME.
                get(valueString, String.valueOf(e));
                get(valueString, e);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message, e);
          }
@@ -1328,14 +1310,14 @@
        else
        {
          LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
              valueString, String.valueOf(valueString.charAt(14)), 14);
              valueString, valueString.charAt(14), 14);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }

      default:
        LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_INVALID_CHAR.get(
            valueString, String.valueOf(valueString.charAt(14)), 14);
            valueString, valueString.charAt(14), 14);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                     message);
    }
@@ -1406,7 +1388,7 @@
          {
            LocalizableMessage message =
                WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_FRACTION_CHAR.
                  get(value, String.valueOf(c));
                  get(value, c);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message);
          }
@@ -1422,7 +1404,7 @@
        default:
          LocalizableMessage message =
              WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_FRACTION_CHAR.
                get(value, String.valueOf(c));
                get(value, c);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
      }
@@ -1462,8 +1444,7 @@

      // This should only happen if the provided date wasn't legal
      // (e.g., September 31).
      LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME.get(
          value, String.valueOf(e));
      LocalizableMessage message = WARN_ATTR_SYNTAX_GENERALIZED_TIME_ILLEGAL_TIME.get(value, e);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                   message, e);
    }

 opendj3-server-dev/src/server/org/opends/server/schema/IntegerFirstComponentEqualityMatchingRule.java

@@ -273,10 +273,8 @@
      {
        logger.traceException(e);

        LocalizableMessage message = ERR_EMR_INTFIRSTCOMP_NO_INITIAL_PARENTHESIS.get(
            String.valueOf(valueString));
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                     message, e);
        LocalizableMessage message = ERR_EMR_INTFIRSTCOMP_NO_INITIAL_PARENTHESIS.get(valueString);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, e);
      }
    }

@@ -288,10 +286,8 @@

    if (pos >= valueLength)
    {
      LocalizableMessage message =
          ERR_EMR_INTFIRSTCOMP_NO_NONSPACE.get(String.valueOf(valueString));
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                   message);
      LocalizableMessage message = ERR_EMR_INTFIRSTCOMP_NO_NONSPACE.get(valueString);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -305,10 +301,8 @@

    if (pos >= valueLength)
    {
      LocalizableMessage message = ERR_EMR_INTFIRSTCOMP_NO_SPACE_AFTER_INT.get(
          String.valueOf(valueString));
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                   message);
      LocalizableMessage message = ERR_EMR_INTFIRSTCOMP_NO_SPACE_AFTER_INT.get(valueString);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -322,10 +316,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_EMR_INTFIRSTCOMP_FIRST_COMPONENT_NOT_INT.get(
          String.valueOf(valueString));
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                   message);
      LocalizableMessage message = ERR_EMR_INTFIRSTCOMP_FIRST_COMPONENT_NOT_INT.get(valueString);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
  }
}

 opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java

@@ -290,8 +290,7 @@
    {

      LocalizableMessage message =
              ERR_ATTR_SYNTAX_LDAPSYNTAX_EXPECTED_OPEN_PARENTHESIS.get(
                      valueStr, (pos-1), String.valueOf(c));
              ERR_ATTR_SYNTAX_LDAPSYNTAX_EXPECTED_OPEN_PARENTHESIS.get(valueStr, (pos-1), c);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
              message);
    }
@@ -342,7 +341,7 @@
          // This must have been an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_LDAPSYNTAX_ILLEGAL_CHAR_IN_NUMERIC_OID.
                get(valueStr, String.valueOf(c), (pos-1));
                get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -371,7 +370,7 @@
          // This must have been an illegal character.
          LocalizableMessage message =
                  ERR_ATTR_SYNTAX_LDAPSYNTAX_ILLEGAL_CHAR_IN_STRING_OID.
              get(valueStr, String.valueOf(c), (pos-1));
              get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -468,10 +467,8 @@
        AttributeSyntax<?> subSyntax = schema.getSyntax(syntaxOID);
        if (subSyntax == null)
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_LDAPSYNTAX_UNKNOWN_SYNTAX.get(
              String.valueOf(oid), syntaxOID);
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_LDAPSYNTAX_UNKNOWN_SYNTAX.get(oid, syntaxOID);
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
        }
        syntax = new SubstitutionSyntax(subSyntax,valueStr,description,oid);
      }
@@ -715,8 +712,7 @@
    // The next character must be a single quote.
    if (c != '\'')
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_LDAPSYNTAX_EXPECTED_QUOTE_AT_POS.get(
          valueStr, startPos, String.valueOf(c));
      LocalizableMessage message = ERR_ATTR_SYNTAX_LDAPSYNTAX_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }

 opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java

@@ -269,9 +269,7 @@
    char c = valueStr.charAt(pos++);
    if (c != '(')
    {

      invalidReason.append(ERR_ATTR_SYNTAX_MR_EXPECTED_OPEN_PARENTHESIS.get(
              valueStr, (pos-1), String.valueOf(c)));
      invalidReason.append(ERR_ATTR_SYNTAX_MR_EXPECTED_OPEN_PARENTHESIS.get(valueStr, (pos-1), c));
      return false;
    }

@@ -317,10 +315,7 @@
        else if (! isDigit(c))
        {
          // This must have been an illegal character.

          invalidReason.append(
                  ERR_ATTR_SYNTAX_MR_ILLEGAL_CHAR_IN_NUMERIC_OID.get(
                          valueStr, String.valueOf(c), (pos-1)));
          invalidReason.append(ERR_ATTR_SYNTAX_MR_ILLEGAL_CHAR_IN_NUMERIC_OID.get(valueStr, c, pos-1));
          return false;
        }
        else
@@ -343,10 +338,7 @@
        else
        {
          // This must have been an illegal character.

          invalidReason.append(
                  ERR_ATTR_SYNTAX_MR_ILLEGAL_CHAR_IN_STRING_OID.get(
                          valueStr, String.valueOf(c), (pos-1)));
          invalidReason.append(ERR_ATTR_SYNTAX_MR_ILLEGAL_CHAR_IN_STRING_OID.get(valueStr, c, (pos-1)));
          return false;
        }
      }
@@ -510,9 +502,7 @@
        else
        {
          // This is an illegal character.

          invalidReason.append(ERR_ATTR_SYNTAX_MR_ILLEGAL_CHAR.get(
                  valueStr, String.valueOf(c), (pos-1)));
          invalidReason.append(ERR_ATTR_SYNTAX_MR_ILLEGAL_CHAR.get(valueStr, c, (pos-1)));
          return false;
        }
      }
@@ -706,11 +696,8 @@
    // The next character must be a single quote.
    if (c != '\'')
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_MR_EXPECTED_QUOTE_AT_POS.get(
                  valueStr, startPos, String.valueOf(c));
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_MR_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -792,9 +779,7 @@
    // The next character must be a single quote.
    if (c != '\'')
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_MR_EXPECTED_QUOTE_AT_POS.get(
                  valueStr, startPos, String.valueOf(c));
      LocalizableMessage message = ERR_ATTR_SYNTAX_MR_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -909,11 +894,9 @@
          }

          // This must have been an illegal character.
          LocalizableMessage message =
                  ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID.get(
                          lowerStr, String.valueOf(c), (startPos - 1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID.get(
              lowerStr, c, (startPos - 1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else
        {
@@ -947,21 +930,16 @@
          }

          // This must have been an illegal character.
          LocalizableMessage message =
                  ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID.
                          get(lowerStr, String.valueOf(c), (startPos - 1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID.get(
              lowerStr, c, (startPos - 1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
    }
    else
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
                  lowerStr, String.valueOf(c), startPos);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(lowerStr, c, startPos);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -1071,11 +1049,8 @@
        else if (c == '(')
        {
          // This is an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_MR_ILLEGAL_CHAR.get(
                      valueStr, String.valueOf(c), startPos);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_MR_ILLEGAL_CHAR.get(valueStr, c, startPos);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else if (c == '\'')
        {

 opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java

@@ -280,10 +280,8 @@
    char c = valueStr.charAt(pos++);
    if (c != '(')
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_EXPECTED_OPEN_PARENTHESIS.get(
          valueStr, (pos-1), String.valueOf(c));
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_EXPECTED_OPEN_PARENTHESIS.get(valueStr, (pos-1), c);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -333,10 +331,8 @@
        else if (! isDigit(c))
        {
          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_NUMERIC_OID.
              get(valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_NUMERIC_OID.get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else
        {
@@ -359,9 +355,8 @@
        {
          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_STRING_OID.
              get(valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
    }
@@ -494,11 +489,8 @@
        else
        {
          // This is an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(
                      valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
      else if (lowerTokenName.equals("desc"))
@@ -563,10 +555,8 @@
            else if (c != '$')
            {
              LocalizableMessage message =
                  ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(
                          valueStr, String.valueOf(c), (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
                  ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
            }
          }
        }
@@ -724,7 +714,7 @@
    if (c != '\'')
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_EXPECTED_QUOTE_AT_POS.get(
          valueStr, startPos, String.valueOf(c));
          valueStr, startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -808,8 +798,7 @@
    // The next character must be a single quote.
    if (c != '\'')
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_EXPECTED_QUOTE_AT_POS.get(
          valueStr, startPos, String.valueOf(c));
      LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_EXPECTED_QUOTE_AT_POS.get(valueStr, startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -924,9 +913,8 @@

          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_NUMERIC_OID.
              get(lowerStr, String.valueOf(c), (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              get(lowerStr, c, (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else
        {
@@ -961,19 +949,15 @@

          // This must have been an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR_IN_STRING_OID.
              get(lowerStr, String.valueOf(c), (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              get(lowerStr, c, (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
    }
    else
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(
                  lowerStr, String.valueOf(c), startPos);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(lowerStr, c, startPos);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -1082,11 +1066,8 @@
        else if (c == '(')
        {
          // This is an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(
                      valueStr, String.valueOf(c), startPos);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
          LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_ILLEGAL_CHAR.get(valueStr, c, startPos);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else if (c == '\'')
        {

 opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java

@@ -268,8 +268,7 @@
        {

          invalidReason.append(
                  ERR_ATTR_SYNTAX_NAMEANDUID_ILLEGAL_BINARY_DIGIT.get(
                          valueString, String.valueOf(c), i));
                  ERR_ATTR_SYNTAX_NAMEANDUID_ILLEGAL_BINARY_DIGIT.get(valueString, c, i));
          return false;
        }
      }

 opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java

@@ -525,10 +525,8 @@
          else
          {
            LocalizableMessage message =
                ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_STRUCTURAL_CLASS.
                  get(String.valueOf(oid), String.valueOf(woidBuffer));
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                         message);
                ERR_ATTR_SYNTAX_NAME_FORM_UNKNOWN_STRUCTURAL_CLASS.get(oid, woidBuffer);
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
          }
        }
        else if (structuralClass.getObjectClassType() !=
@@ -538,9 +536,9 @@
          // structural.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_NAME_FORM_STRUCTURAL_CLASS_NOT_STRUCTURAL.
                get(String.valueOf(oid), String.valueOf(woidBuffer),
                get(oid, woidBuffer,
                    structuralClass.getNameOrOID(),
                    String.valueOf(structuralClass.getObjectClassType()));
                    structuralClass.getObjectClassType());
          throw new DirectoryException(
                  ResultCode.CONSTRAINT_VIOLATION, message);
        }

 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java

@@ -246,9 +246,7 @@
      char c = valueString.charAt(i);
      if (! (isDigit(c) || (c == ' ')))
      {

        invalidReason.append(WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR.get(
                valueString, String.valueOf(c), i));
        invalidReason.append(WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR.get(valueString, c, i));
        return false;
      }
    }

 opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java

@@ -282,9 +282,8 @@
    if (c != '(')
    {
      LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_OPEN_PARENTHESIS.
          get(valueStr, (pos-1), String.valueOf(c));
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
          get(valueStr, (pos-1), c);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }


@@ -337,9 +336,8 @@
          // This must have been an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID.
                get(valueStr, String.valueOf(c), (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
                get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
        else
        {
@@ -363,7 +361,7 @@
          // This must have been an illegal character.
          LocalizableMessage message =
              ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID.
                get(valueStr, String.valueOf(c), (pos-1));
                get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -496,8 +494,7 @@
        else
        {
          // This is an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
              valueStr, String.valueOf(c), (pos-1));
          LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -605,10 +602,8 @@
                // This is bad because we don't know what the superior oc
                // is so we can't base this objectclass on it.
                LocalizableMessage message =
                    WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS.
                      get(String.valueOf(oid), String.valueOf(woidBuffer));
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
                    WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS.get(oid, woidBuffer);
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
              }
            }

@@ -623,8 +618,7 @@
            }
            else if (c != '$')
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
                  valueStr, String.valueOf(c), (pos-1));
              LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
            }
@@ -648,10 +642,8 @@
              // This is bad because we don't know what the superior oc
              // is so we can't base this objectclass on it.
              LocalizableMessage message =
                  WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS.
                    get(String.valueOf(oid), String.valueOf(woidBuffer));
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
                  WARN_ATTR_SYNTAX_OBJECTCLASS_UNKNOWN_SUPERIOR_CLASS.get(oid, woidBuffer);
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
            }
          }
          listSupOCs.add(superiorClass);
@@ -726,8 +718,7 @@
            }
            else if (c != '$')
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
                  valueStr, String.valueOf(c), (pos-1));
              LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
            }
@@ -812,8 +803,7 @@
            }
            else if (c != '$')
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
                  valueStr, String.valueOf(c), (pos-1));
              LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, (pos-1));
              throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                           message);
            }
@@ -1040,7 +1030,7 @@
    if (c != '\'')
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_QUOTE_AT_POS.get(
          valueStr, startPos, String.valueOf(c));
          valueStr,startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -1127,7 +1117,7 @@
    if (c != '\'')
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_OBJECTCLASS_EXPECTED_QUOTE_AT_POS.get(
          valueStr, startPos, String.valueOf(c));
          valueStr,startPos, c);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -1248,7 +1238,7 @@
          // This must have been an illegal character.
          LocalizableMessage message =
            ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_NUMERIC_OID.
                get(lowerStr, String.valueOf(c), (startPos-1));
                get(lowerStr, c, (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -1286,7 +1276,7 @@
          // This must have been an illegal character.
          LocalizableMessage message =
            ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR_IN_STRING_OID.
                get(lowerStr, String.valueOf(c), (startPos-1));
                get(lowerStr, c, (startPos-1));
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }
@@ -1295,8 +1285,7 @@
    else
    {
      LocalizableMessage message =
          ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
                  lowerStr, String.valueOf(c), startPos);
          ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(lowerStr, c, startPos);
      throw new DirectoryException(
              ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -1406,8 +1395,7 @@
        else if (c == '(')
        {
          // This is an illegal character.
          LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(
              valueStr, String.valueOf(c), startPos);
          LocalizableMessage message = ERR_ATTR_SYNTAX_OBJECTCLASS_ILLEGAL_CHAR.get(valueStr, c, startPos);
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        }

 opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java

@@ -259,10 +259,8 @@
      }
      else if (! PrintableString.isPrintableCharacter(c))
      {

        invalidReason.append(
                ERR_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MBTYPE_CHAR.get(
                        valueString, String.valueOf(c), pos));
                ERR_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MBTYPE_CHAR.get(valueString, c, pos));
        return false;
      }
    }
@@ -284,9 +282,7 @@
      char c = valueString.charAt(pos);
      if (c != (c & 0x7F))
      {

        invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MB_CHAR.get(
                valueString, String.valueOf(c), pos));
        invalidReason.append(ERR_ATTR_SYNTAX_OTHER_MAILBOX_ILLEGAL_MB_CHAR.get(valueString, c, pos));
        return false;
      }
    }

 opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java

@@ -265,10 +265,8 @@
      char c = valueString.charAt(i);
      if (! PrintableString.isPrintableCharacter(c))
      {

        invalidReason.append(
                WARN_ATTR_SYNTAX_PRINTABLE_STRING_ILLEGAL_CHARACTER.get(
                        valueString, String.valueOf(c), i));
                WARN_ATTR_SYNTAX_PRINTABLE_STRING_ILLEGAL_CHARACTER.get(valueString, c, i));
        return false;
      }
    }

 opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java

@@ -292,8 +292,7 @@
        }
        else if (! isSeparator(c))
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_TELEPHONE_ILLEGAL_CHAR.get(
                  valueStr, String.valueOf(c), i);
          LocalizableMessage message = ERR_ATTR_SYNTAX_TELEPHONE_ILLEGAL_CHAR.get(valueStr, c, i);
          invalidReason.append(message);
          return false;
        }

 opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java

@@ -275,9 +275,7 @@
    char c = valueString.charAt(0);
    if (! PrintableString.isPrintableCharacter(c))
    {

      invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE.get(
              valueString, String.valueOf(c), 0));
      invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE.get(valueString, c, 0));
      return false;
    }

@@ -297,9 +295,7 @@
      {
        if (! PrintableString.isPrintableCharacter(c))
        {

          invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE.get(
                  valueString, String.valueOf(c), pos));
          invalidReason.append(ERR_ATTR_SYNTAX_TELETEXID_NOT_PRINTABLE.get(valueString, c, pos));
        }
      }
    }

 opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java

@@ -238,9 +238,7 @@
    char c = valueString.charAt(0);
    if (! PrintableString.isPrintableCharacter(c))
    {

      invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(
              valueString, String.valueOf(c), 0));
      invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(valueString, c, 0));
      return false;
    }

@@ -260,9 +258,7 @@
      {
        if (! PrintableString.isPrintableCharacter(c))
        {

          invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(
                  valueString, String.valueOf(c), pos));
          invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(valueString, c, pos));
        }
      }
    }
@@ -279,9 +275,7 @@
    c = valueString.charAt(pos++);
    if (! PrintableString.isPrintableCharacter(c))
    {

      invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(
              valueString, String.valueOf(c), (pos-1)));
      invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(valueString, c, (pos-1)));
      return false;
    }

@@ -300,9 +294,7 @@
      {
        if (! PrintableString.isPrintableCharacter(c))
        {

          invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(
                  valueString, String.valueOf(c), pos));
          invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(valueString, c, pos));
          return false;
        }
      }
@@ -320,9 +312,7 @@
    c = valueString.charAt(pos++);
    if (! PrintableString.isPrintableCharacter(c))
    {

      invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(
              valueString, String.valueOf(c), (pos-1)));
      invalidReason.append(ERR_ATTR_SYNTAX_TELEX_NOT_PRINTABLE.get(valueString, c, (pos-1)));
      return false;
    }

@@ -334,14 +324,11 @@
      c = valueString.charAt(pos);
      if (! PrintableString.isPrintableCharacter(c))
      {

        invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(
                valueString, String.valueOf(c), pos));
        invalidReason.append(ERR_ATTR_SYNTAX_TELEX_ILLEGAL_CHAR.get(valueString, c, pos));
        return false;
      }
    }


    // If we've gotten here, then we're at the end of the value and it is
    // acceptable.
    return true;

 opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java

@@ -310,8 +310,7 @@
          // These are all fine.
          break;
        default:
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_YEAR.get(
                  valueString, String.valueOf(valueString.charAt(i)));
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_YEAR.get(valueString, valueString.charAt(i));
          invalidReason.append(message);
          return false;
      }
@@ -519,8 +518,7 @@
        // be a digit between 0 and 9.
        if (length < 11)
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                  valueString, String.valueOf(m1), 8);
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(valueString, m1, 8);
          invalidReason.append(message);
          return false;
        }
@@ -549,8 +547,7 @@
        break;

      default:
        LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                valueString, String.valueOf(m1), 8);
        LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(valueString, m1, 8);
        invalidReason.append(message);
        return false;
    }
@@ -573,8 +570,7 @@
        // be a digit between 0 and 9.
        if (length < 13)
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                  valueString, String.valueOf(s1), 10);
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(valueString, s1, 10);
          invalidReason.append(message);
          return false;
        }
@@ -606,9 +602,7 @@
        // a 0.
        if (length < 13)
        {

          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                  valueString, String.valueOf(s1), 10);
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(valueString, s1, 10);
          invalidReason.append(message);
          return false;
        }
@@ -630,8 +624,7 @@
        }
        else
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                  valueString, String.valueOf(s1), 10);
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(valueString, s1, 10);
          invalidReason.append(message);
          return false;
        }
@@ -646,15 +639,13 @@
        }
        else
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                  valueString, String.valueOf(s1), 10);
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(valueString, s1, 10);
          invalidReason.append(message);
          return false;
        }

      default:
        LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                valueString, String.valueOf(s1), 10);
        LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(valueString, s1, 10);
        invalidReason.append(message);
        return false;
    }
@@ -673,7 +664,7 @@
        else
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                  valueString, String.valueOf(valueString.charAt(12)), 12);
                  valueString, valueString.charAt(12), 12);
          invalidReason.append(message);
          return false;
        }
@@ -689,14 +680,14 @@
        else
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                  valueString, String.valueOf(valueString.charAt(12)), 12);
                  valueString, valueString.charAt(12), 12);
          invalidReason.append(message);
          return false;
        }

      default:
        LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_INVALID_CHAR.get(
                valueString, String.valueOf(valueString.charAt(12)), 12);
                valueString, valueString.charAt(12), 12);
        invalidReason.append(message);
        return false;
    }
@@ -906,10 +897,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_CANNOT_PARSE.get(
          valueString, String.valueOf(e));
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                   message, e);
      LocalizableMessage message = ERR_ATTR_SYNTAX_UTC_TIME_CANNOT_PARSE.get(valueString, e);
      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, e);
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java

@@ -237,9 +237,8 @@
        case 23:
          if (valueString.charAt(i) != '-')
          {

            invalidReason.append(WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(
                    valueString, i, String.valueOf(valueString.charAt(i))));
                    valueString, i, valueString.charAt(i)));
            return false;
          }
          break;
@@ -270,9 +269,8 @@
            case 'F':
              break;
            default:

              invalidReason.append(WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX.get(
                      valueString, i, String.valueOf(valueString.charAt(i))));
                      valueString, i, valueString.charAt(i)));
              return false;
          }
      }

 opendj3-server-dev/src/server/org/opends/server/schema/UniqueMemberEqualityMatchingRule.java

@@ -226,8 +226,7 @@
        {
          // There was an invalid binary digit.  We'll either throw an exception
          // or log a message and continue, based on the server's configuration.
          LocalizableMessage message = ERR_ATTR_SYNTAX_NAMEANDUID_ILLEGAL_BINARY_DIGIT.get(
                  valueString, String.valueOf(c), i);
          LocalizableMessage message = ERR_ATTR_SYNTAX_NAMEANDUID_ILLEGAL_BINARY_DIGIT.get(valueString, c, i);

          switch (DirectoryServer.getSyntaxEnforcementPolicy())
          {

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

@@ -98,8 +98,7 @@
    if ((attrList == null) || attrList.isEmpty())
    {
      LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_NO_FILENAME.get(
          ATTR_TASK_ADDSCHEMAFILE_FILENAME,
          String.valueOf(taskEntry.getName()));
          ATTR_TASK_ADDSCHEMAFILE_FILENAME, taskEntry.getName());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
    }

@@ -158,7 +157,7 @@
        logger.traceException(ce);

        LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE.get(
            String.valueOf(schemaFile), ce.getMessage());
            schemaFile, ce.getMessage());
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message, ce);
      }
@@ -167,7 +166,7 @@
        logger.traceException(ie);

        LocalizableMessage message = ERR_TASK_ADDSCHEMAFILE_ERROR_LOADING_SCHEMA_FILE.get(
            String.valueOf(schemaFile), ie.getMessage());
            schemaFile, ie.getMessage());
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                     message, ie);
      }

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

@@ -92,8 +92,7 @@
    Entry taskEntry = getTaskEntry();

    restart         = false;
    shutdownMessage = INFO_TASK_SHUTDOWN_DEFAULT_MESSAGE.get(
        String.valueOf(taskEntry.getName()));
    shutdownMessage = INFO_TASK_SHUTDOWN_DEFAULT_MESSAGE.get(taskEntry.getName());

    AttributeType attrType =
         DirectoryServer.getAttributeType(ATTR_SHUTDOWN_MESSAGE, true);
@@ -103,11 +102,8 @@
      Attribute attr = attrList.get(0);
      if (!attr.isEmpty())
      {
        String valueString = attr.iterator().next()
            .getValue().toString();

        shutdownMessage = INFO_TASK_SHUTDOWN_CUSTOM_MESSAGE.get(String
            .valueOf(taskEntry.getName()), String.valueOf(valueString));
        String valueString = attr.iterator().next().getValue().toString();
        shutdownMessage = INFO_TASK_SHUTDOWN_CUSTOM_MESSAGE.get(taskEntry.getName(), valueString);
      }
    }


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

@@ -421,8 +421,7 @@
      {
        if (ports.contains(adminConnectorPort.getIntValue()))
        {
          LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(
                  String.valueOf(adminConnectorPort.getIntValue()));
          LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(adminConnectorPort.getIntValue());
          err.println(wrapText(message, MAX_LINE_WIDTH));
          err.println(argParser.getUsage());
          return 1;
@@ -436,8 +435,7 @@
      {
        if (ports.contains(ldapsPort.getIntValue()))
        {
          LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(
                  String.valueOf(ldapsPort.getIntValue()));
          LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(ldapsPort.getIntValue());
          err.println(wrapText(message, MAX_LINE_WIDTH));
          err.println(argParser.getUsage());
          return 1;
@@ -451,8 +449,7 @@
      {
        if (ports.contains(jmxPort.getIntValue()))
        {
          LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(
                  String.valueOf(jmxPort.getIntValue()));
          LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(jmxPort.getIntValue());
          err.println(wrapText(message, MAX_LINE_WIDTH));
          err.println(argParser.getUsage());
          return 1;
@@ -491,9 +488,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIGDS_CANNOT_INITIALIZE_JMX.get(
              String.valueOf(configFile.getValue()),
              e.getMessage());
      LocalizableMessage message = ERR_CONFIGDS_CANNOT_INITIALIZE_JMX.get(configFile.getValue(), e.getMessage());
      err.println(wrapText(message, MAX_LINE_WIDTH));
      return 1;
    }
@@ -505,9 +500,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIGDS_CANNOT_INITIALIZE_CONFIG.get(
              String.valueOf(configFile.getValue()),
              e.getMessage());
      LocalizableMessage message = ERR_CONFIGDS_CANNOT_INITIALIZE_CONFIG.get(configFile.getValue(), e.getMessage());
      err.println(wrapText(message, MAX_LINE_WIDTH));
      return 1;
    }
@@ -518,9 +511,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIGDS_CANNOT_INITIALIZE_SCHEMA.get(
              String.valueOf(configFile.getValue()),
              e.getMessage());
      LocalizableMessage message = ERR_CONFIGDS_CANNOT_INITIALIZE_SCHEMA.get(configFile.getValue(), e.getMessage());
      err.println(wrapText(message, MAX_LINE_WIDTH));
      return 1;
    }
@@ -533,9 +524,7 @@
    if (! LockFileManager.acquireExclusiveLock(serverLockFileName,
                                               failureReason))
    {
      LocalizableMessage message = ERR_CONFIGDS_CANNOT_ACQUIRE_SERVER_LOCK.get(
              String.valueOf(serverLockFileName),
              String.valueOf(failureReason));
      LocalizableMessage message = ERR_CONFIGDS_CANNOT_ACQUIRE_SERVER_LOCK.get(serverLockFileName, failureReason);
      err.println(wrapText(message, MAX_LINE_WIDTH));
      return 1;
    }
@@ -557,9 +546,7 @@
          }
          catch (DirectoryException de)
          {
            LocalizableMessage message = ERR_CONFIGDS_CANNOT_PARSE_BASE_DN.get(
                    String.valueOf(dnString),
                    de.getMessageObject());
            LocalizableMessage message = ERR_CONFIGDS_CANNOT_PARSE_BASE_DN.get(dnString, de.getMessageObject());
            err.println(wrapText(message, MAX_LINE_WIDTH));
            return 1;
          }
@@ -580,8 +567,7 @@
        catch (DirectoryException de)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_PARSE_ROOT_DN.get(
                  String.valueOf(rootDNString.getValue()),
                  de.getMessageObject());
              rootDNString.getValue(), de.getMessageObject());
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -657,9 +643,7 @@
          }
          catch (Exception e)
          {
            LocalizableMessage message =
              ERR_CONFIG_KEYMANAGER_CANNOT_CREATE_JCEKS_PROVIDER.get(
                String.valueOf(e));
            LocalizableMessage message = ERR_CONFIG_KEYMANAGER_CANNOT_CREATE_JCEKS_PROVIDER.get(e);
            err.println(wrapText(message, MAX_LINE_WIDTH));
            return 1;
          }
@@ -672,8 +656,7 @@
          }
          catch (Exception e)
          {
            LocalizableMessage message = ERR_CONFIG_KEYMANAGER_CANNOT_GET_BASE.get(
                String.valueOf(e));
            LocalizableMessage message = ERR_CONFIG_KEYMANAGER_CANNOT_GET_BASE.get(e);
            err.println(wrapText(message, MAX_LINE_WIDTH));
            return 1;
          }
@@ -725,8 +708,7 @@
          }
          catch (Exception e)
          {
            LocalizableMessage message = ERR_CONFIG_KEYMANAGER_CANNOT_GET_BASE.get(
                String.valueOf(e));
            LocalizableMessage message = ERR_CONFIG_KEYMANAGER_CANNOT_GET_BASE.get(e);
            err.println(wrapText(message, MAX_LINE_WIDTH));
            return 1;
          }
@@ -739,8 +721,7 @@
          }
          catch (Exception e)
          {
            LocalizableMessage message = ERR_CONFIG_TRUSTMANAGER_CANNOT_GET_BASE.get(
                String.valueOf(e));
            LocalizableMessage message = ERR_CONFIG_TRUSTMANAGER_CANNOT_GET_BASE.get(e);
            err.println(wrapText(message, MAX_LINE_WIDTH));
            return 1;
          }
@@ -778,8 +759,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_BASE_DN.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_BASE_DN.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -805,8 +785,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_LDAP_PORT.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_LDAP_PORT.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -833,8 +812,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_ADMIN_CONNECTOR_PORT.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_ADMIN_CONNECTOR_PORT.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -865,8 +843,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_LDAPS_PORT.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_LDAPS_PORT.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -897,8 +874,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_JMX_PORT.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_JMX_PORT.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -922,8 +898,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_ENABLE_STARTTLS.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_ENABLE_STARTTLS.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -948,8 +923,7 @@
          }
          catch (Exception e)
          {
            LocalizableMessage message = ERR_CONFIGDS_CANNOT_ENABLE_KEYMANAGER.get(
                    String.valueOf(e));
            LocalizableMessage message = ERR_CONFIGDS_CANNOT_ENABLE_KEYMANAGER.get(e);
            err.println(wrapText(message, MAX_LINE_WIDTH));
            return 1;
          }
@@ -988,8 +962,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_KEYMANAGER_REFERENCE.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_KEYMANAGER_REFERENCE.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -1034,8 +1007,7 @@
          }
          catch (Exception e)
          {
            LocalizableMessage message = ERR_CONFIGDS_CANNOT_ENABLE_TRUSTMANAGER.get(
                    String.valueOf(e));
            LocalizableMessage message = ERR_CONFIGDS_CANNOT_ENABLE_TRUSTMANAGER.get(e);
            err.println(wrapText(message, MAX_LINE_WIDTH));
            return 1;
          }
@@ -1075,9 +1047,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message =
                  ERR_CONFIGDS_CANNOT_UPDATE_TRUSTMANAGER_REFERENCE.get(
                          String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_TRUSTMANAGER_REFERENCE.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -1139,8 +1109,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_CERT_NICKNAME.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_CERT_NICKNAME.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -1173,8 +1142,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_CERT_NICKNAME.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_CERT_NICKNAME.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -1207,8 +1175,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_ROOT_USER.get(
                  String.valueOf(e));
          LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_ROOT_USER.get(e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return 1;
        }
@@ -1226,8 +1193,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_DIGEST_MD5_FQDN.get(String
            .valueOf(e));
        LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_DIGEST_MD5_FQDN.get(e);
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -1276,8 +1242,7 @@
            }
            catch (Exception e)
            {
              LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_CRYPTO_MANAGER.get(
                  String.valueOf(e));
              LocalizableMessage message = ERR_CONFIGDS_CANNOT_UPDATE_CRYPTO_MANAGER.get(e);
              err.println(wrapText(message, MAX_LINE_WIDTH));
              return 1;
            }

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

@@ -616,17 +616,13 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
      {
        LocalizableMessage message = ERR_DBTEST_CANNOT_LOCK_BACKEND.get(
            backend.getBackendID(), String.valueOf(failureReason));
        printMessage(message);
        printMessage(ERR_DBTEST_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), failureReason));
        return 1;
      }
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_DBTEST_CANNOT_LOCK_BACKEND.get(
          backend.getBackendID(), getExceptionMessage(e));
      printMessage(message);
      printMessage(ERR_DBTEST_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), getExceptionMessage(e)));
      return 1;
    }

@@ -695,16 +691,12 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.releaseLock(lockFile, failureReason))
        {
        LocalizableMessage message = WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(
            backend.getBackendID(), String.valueOf(failureReason));
          printMessage(message);
          printMessage(WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), failureReason));
        }
      }
      catch (Exception e)
      {
      LocalizableMessage message = WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(
          backend.getBackendID(), getExceptionMessage(e));
        printMessage(message);
        printMessage(WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), getExceptionMessage(e)));
      }
    }
  }
@@ -752,17 +744,13 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
      {
        LocalizableMessage message = ERR_DBTEST_CANNOT_LOCK_BACKEND.get(
            backend.getBackendID(), String.valueOf(failureReason));
        printMessage(message);
        printMessage(ERR_DBTEST_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), failureReason));
        return 1;
      }
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_DBTEST_CANNOT_LOCK_BACKEND.get(
          backend.getBackendID(), getExceptionMessage(e));
      printMessage(message);
      printMessage(ERR_DBTEST_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), getExceptionMessage(e)));
      return 1;
    }

@@ -870,16 +858,12 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.releaseLock(lockFile, failureReason))
        {
          LocalizableMessage message = WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(
              backend.getBackendID(), String.valueOf(failureReason));
          printMessage(message);
          printMessage(WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), failureReason));
        }
      }
      catch (Exception e)
      {
        LocalizableMessage message = WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(
            backend.getBackendID(), getExceptionMessage(e));
        printMessage(message);
        printMessage(WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), getExceptionMessage(e)));
      }
    }
  }
@@ -927,17 +911,13 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
      {
        LocalizableMessage message = ERR_DBTEST_CANNOT_LOCK_BACKEND.get(
            backend.getBackendID(), String.valueOf(failureReason));
        printMessage(message);
        printMessage(ERR_DBTEST_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), failureReason));
        return 1;
      }
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_DBTEST_CANNOT_LOCK_BACKEND.get(
          backend.getBackendID(), getExceptionMessage(e));
      printMessage(message);
      printMessage(ERR_DBTEST_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), getExceptionMessage(e)));
      return 1;
    }

@@ -1126,16 +1106,12 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.releaseLock(lockFile, failureReason))
        {
        LocalizableMessage message = WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(
            backend.getBackendID(), String.valueOf(failureReason));
          printMessage(message);
          printMessage(WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), failureReason));
        }
      }
      catch (Exception e)
      {
      LocalizableMessage message = WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(
          backend.getBackendID(), getExceptionMessage(e));
        printMessage(message);
        printMessage(WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), getExceptionMessage(e)));
      }
    }
  }
@@ -1183,17 +1159,13 @@
      StringBuilder failureReason = new StringBuilder();
      if (! LockFileManager.acquireSharedLock(lockFile, failureReason))
      {
        LocalizableMessage message = ERR_DBTEST_CANNOT_LOCK_BACKEND.get(
            backend.getBackendID(), String.valueOf(failureReason));
        printMessage(message);
        printMessage(ERR_DBTEST_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), failureReason));
        return 1;
      }
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_DBTEST_CANNOT_LOCK_BACKEND.get(
          backend.getBackendID(), getExceptionMessage(e));
      printMessage(message);
      printMessage(ERR_DBTEST_CANNOT_LOCK_BACKEND.get(backend.getBackendID(), getExceptionMessage(e)));
      return 1;
    }

@@ -1725,16 +1697,12 @@
        StringBuilder failureReason = new StringBuilder();
        if (! LockFileManager.releaseLock(lockFile, failureReason))
        {
          LocalizableMessage message = WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(
              backend.getBackendID(), String.valueOf(failureReason));
          printMessage(message);
          printMessage(WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), failureReason));
        }
      }
      catch (Exception e)
      {
        LocalizableMessage message = WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(
            backend.getBackendID(), getExceptionMessage(e));
        printMessage(message);
        printMessage(WARN_DBTEST_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), getExceptionMessage(e)));
      }
    }
  }

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

@@ -591,9 +591,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_ENCPW_INVALID_ENCODED_AUTHPW.get(
                  String.valueOf(e));
          err.println(wrapText(message, MAX_LINE_WIDTH));
          err.println(wrapText(ERR_ENCPW_INVALID_ENCODED_AUTHPW.get(e), MAX_LINE_WIDTH));
          return OPERATIONS_ERROR;
        }

@@ -656,9 +654,7 @@
          }
          catch (Exception e)
          {
            LocalizableMessage message = ERR_ENCPW_INVALID_ENCODED_USERPW.get(
                    String.valueOf(e));
            err.println(wrapText(message, MAX_LINE_WIDTH));
            err.println(wrapText(ERR_ENCPW_INVALID_ENCODED_USERPW.get(e), MAX_LINE_WIDTH));
            return OPERATIONS_ERROR;
          }
        }

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

@@ -1198,9 +1198,7 @@
        {
          if (usedPorts.contains(portNumber))
          {
            LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(
                String.valueOf(portNumber));
            println(message);
            println(ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(portNumber));
            println();
            portNumber = -1;
          }
@@ -2127,8 +2125,7 @@
          if (nPasswordPrompts > LIMIT_KEYSTORE_PASSWORD_PROMPT)
          {
            throw new UserDataException(null,
                ERR_INSTALLDS_TOO_MANY_KEYSTORE_PASSWORD_TRIES.get(
                    String.valueOf(LIMIT_KEYSTORE_PASSWORD_PROMPT)));
                ERR_INSTALLDS_TOO_MANY_KEYSTORE_PASSWORD_TRIES.get(LIMIT_KEYSTORE_PASSWORD_PROMPT));
          }
          pwd = readPassword(
                INFO_INSTALLDS_PROMPT_KEYSTORE_PASSWORD.get(), logger);

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

@@ -544,9 +544,7 @@

      if (ports.contains(adminConnectorPortArg.getIntValue()))
      {
        LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(
            String.valueOf(adminConnectorPortArg.getIntValue()));
        errorMessages.add(message);
        errorMessages.add(ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(adminConnectorPortArg.getIntValue()));
      }
      else
      {
@@ -557,9 +555,7 @@
      {
        if (ports.contains(jmxPortArg.getIntValue()))
        {
          LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(
                  String.valueOf(jmxPortArg.getIntValue()));
          errorMessages.add(message);
          errorMessages.add(ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(jmxPortArg.getIntValue()));
        }
        else
        {
@@ -570,9 +566,7 @@
      {
        if (ports.contains(ldapsPortArg.getIntValue()))
        {
          LocalizableMessage message = ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(
                  String.valueOf(ldapsPortArg.getIntValue()));
          errorMessages.add(message);
          errorMessages.add(ERR_CONFIGDS_PORT_ALREADY_SPECIFIED.get(ldapsPortArg.getIntValue()));
        }
        else
        {

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

@@ -399,17 +399,13 @@
        }
        else
        {
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
              String.valueOf(extendedResponse));
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                    message);
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        }

      default:
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
            String.valueOf(responseMessage.getProtocolOp()));
        throw new ClientException(
                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
        throw new ClientException( LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
    }


@@ -714,17 +710,13 @@
        }
        else
        {
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
              String.valueOf(extendedResponse));
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                    message);
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        }

      default:
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
            String.valueOf(responseMessage.getProtocolOp()));
        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                  message);
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
    }


@@ -961,17 +953,13 @@
        }
        else
        {
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
              String.valueOf(extendedResponse));
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                    message);
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        }

      default:
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
            String.valueOf(responseMessage1.getProtocolOp()));
        throw new ClientException(
                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage1.getProtocolOp());
        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
    }


@@ -1117,17 +1105,13 @@
        }
        else
        {
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
              String.valueOf(extendedResponse));
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                    message);
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        }

      default:
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
            String.valueOf(responseMessage2.getProtocolOp()));
        throw new ClientException(
                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage2.getProtocolOp());
        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
    }


@@ -1548,17 +1532,13 @@
        }
        else
        {
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
              String.valueOf(extendedResponse));
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                    message);
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        }

      default:
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
            String.valueOf(responseMessage1.getProtocolOp()));
        throw new ClientException(
                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage1.getProtocolOp());
        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
    }


@@ -1873,17 +1853,13 @@
        }
        else
        {
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
              String.valueOf(extendedResponse));
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                    message);
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        }

      default:
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
            String.valueOf(responseMessage2.getProtocolOp()));
        throw new ClientException(
                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage2.getProtocolOp());
        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
    }


@@ -2541,17 +2517,13 @@
        }
        else
        {
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
              String.valueOf(extendedResponse));
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                    message);
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        }

      default:
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
            String.valueOf(responseMessage.getProtocolOp()));
        throw new ClientException(
                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
    }


@@ -3139,17 +3111,13 @@
        }
        else
        {
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
              String.valueOf(extendedResponse));
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                    message);
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        }

      default:
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
            String.valueOf(responseMessage.getProtocolOp()));
        throw new ClientException(
                LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
        LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
        throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
    }


@@ -3366,17 +3334,13 @@
          }
          else
          {
            LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
                String.valueOf(extendedResponse));
            throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                      message);
            LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
            throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
          }

        default:
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
              String.valueOf(responseMessage.getProtocolOp()));
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                    message);
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
      }


@@ -3545,17 +3509,13 @@
              }
              else
              {
                LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(
                    String.valueOf(extendedResponse));
                throw new ClientException(
                               LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
                LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_EXTENDED_RESPONSE.get(extendedResponse);
                throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
              }

            default:
              LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
                  String.valueOf(responseMessage.getProtocolOp()));
              throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR,
                                        message);
              LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
              throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
          }
        }
        else
@@ -3624,8 +3584,7 @@
        }
        else
        {
          LocalizableMessage message =
              ERR_LDAPAUTH_UNEXPECTED_GSSAPI_CALLBACK.get(String.valueOf(cb));
          LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_GSSAPI_CALLBACK.get(cb);
          throw new UnsupportedCallbackException(cb, message.toString());
        }
      }
@@ -3729,10 +3688,8 @@
    // If the protocol op isn't an extended response, then that's a problem.
    if (responseMessage.getProtocolOpType() != OP_TYPE_EXTENDED_RESPONSE)
    {
      LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(
          String.valueOf(responseMessage.getProtocolOp()));
      throw new ClientException(
              LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
      LocalizableMessage message = ERR_LDAPAUTH_UNEXPECTED_RESPONSE.get(responseMessage.getProtocolOp());
      throw new ClientException(LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR, message);
    }



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

@@ -236,8 +236,7 @@
    if (!isScriptFriendly())
    {
      out.println(INFO_PROCESSING_COMPARE_OPERATION.get(
          attributeType, String.valueOf(attrValOctetStr),
          String.valueOf(dnOctetStr)));
          attributeType, attrValOctetStr, dnOctetStr));
    }

    if(!compareOptions.showOperations())
@@ -771,9 +770,8 @@
        catch (Exception e)
        {
          err.println(wrapText(
                  INFO_COMPARE_CANNOT_READ_ASSERTION_VALUE_FROM_FILE.get(
                          String.valueOf(e)),
                          MAX_LINE_WIDTH));
              INFO_COMPARE_CANNOT_READ_ASSERTION_VALUE_FROM_FILE.get(e),
              MAX_LINE_WIDTH));
          return CLIENT_SIDE_PARAM_ERROR;
        }
      } else
@@ -803,9 +801,7 @@
      int versionNumber = version.getIntValue();
      if(versionNumber != 2 && versionNumber != 3)
      {

        err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(
                String.valueOf(versionNumber)), MAX_LINE_WIDTH));
        err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(versionNumber), MAX_LINE_WIDTH));
        return CLIENT_SIDE_PARAM_ERROR;
      }
      connectionOptions.setVersionNumber(versionNumber);

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

@@ -178,8 +178,7 @@

    protocolOp = new DeleteRequestProtocolOp(asn1OctetStr);

    out.println(INFO_PROCESSING_OPERATION.get(
            "DELETE", String.valueOf(asn1OctetStr)));
    out.println(INFO_PROCESSING_OPERATION.get("DELETE", asn1OctetStr));
    if(!deleteOptions.showOperations())
    {
      LDAPMessage message = new LDAPMessage(nextMessageID.getAndIncrement(),
@@ -611,9 +610,7 @@
      int versionNumber = version.getIntValue();
      if(versionNumber != 2 && versionNumber != 3)
      {

        err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(
                String.valueOf(versionNumber)), MAX_LINE_WIDTH));
        err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(versionNumber), MAX_LINE_WIDTH));
        return CLIENT_SIDE_PARAM_ERROR;
      }
      connectionOptions.setVersionNumber(versionNumber);

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

@@ -192,13 +192,13 @@
          }

          LocalizableMessage message = ERR_LDIF_FILE_INVALID_LDIF_ENTRY.get(
              le.getLineNumber(), fileNameValue, String.valueOf(le));
              le.getLineNumber(), fileNameValue, le);
          throw new IOException(message.toString());
        }
        else
        {
          LocalizableMessage message = ERR_LDIF_FILE_INVALID_LDIF_ENTRY.get(
                  le.getLineNumber(), fileNameValue, String.valueOf(le));
              le.getLineNumber(), fileNameValue, le);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          continue;
        }
@@ -217,14 +217,12 @@
            logger.traceException(e2);
          }

          LocalizableMessage message =
              ERR_LDIF_FILE_READ_ERROR.get(fileNameValue, String.valueOf(e));
          LocalizableMessage message = ERR_LDIF_FILE_READ_ERROR.get(fileNameValue, e);
          throw new IOException(message.toString());
        }
        else
        {
          LocalizableMessage message = ERR_LDIF_FILE_READ_ERROR.get(
              fileNameValue, String.valueOf(e));
          LocalizableMessage message = ERR_LDIF_FILE_READ_ERROR.get(fileNameValue, e);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          continue;
        }
@@ -939,9 +937,7 @@
      int versionNumber = version.getIntValue();
      if(versionNumber != 2 && versionNumber != 3)
      {

        err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(
                String.valueOf(versionNumber)), MAX_LINE_WIDTH));
        err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(versionNumber), MAX_LINE_WIDTH));
        return CLIENT_SIDE_PARAM_ERROR;
      }
      connectionOptions.setVersionNumber(versionNumber);

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

@@ -630,8 +630,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message =
                ERR_LDAPPWMOD_ERROR_INITIALIZING_SSL.get(String.valueOf(e));
        LocalizableMessage message = ERR_LDAPPWMOD_ERROR_INITIALIZING_SSL.get(e);
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return CLIENT_SIDE_PARAM_ERROR;
      }
@@ -769,8 +768,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDAPPWMOD_CANNOT_SEND_PWMOD_REQUEST.get(
              String.valueOf(e));
      LocalizableMessage message = ERR_LDAPPWMOD_CANNOT_SEND_PWMOD_REQUEST.get(e);
      err.println(wrapText(message, MAX_LINE_WIDTH));

      try
@@ -799,8 +797,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDAPPWMOD_CANNOT_READ_PWMOD_RESPONSE.get(
              String.valueOf(e));
      LocalizableMessage message = ERR_LDAPPWMOD_CANNOT_READ_PWMOD_RESPONSE.get(e);
      err.println(wrapText(message, MAX_LINE_WIDTH));

      try
@@ -947,8 +944,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_LDAPPWMOD_COULD_NOT_DECODE_RESPONSE_VALUE.get(
                String.valueOf(e));
        LocalizableMessage message = ERR_LDAPPWMOD_COULD_NOT_DECODE_RESPONSE_VALUE.get(e);
        err.println(wrapText(message, MAX_LINE_WIDTH));

        try

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

@@ -374,8 +374,7 @@
                  }
                }
                // FIXME - throw exception?
                LocalizableMessage msg = INFO_SEARCH_OPERATION_INVALID_PROTOCOL.get(
                        String.valueOf(opType));
                LocalizableMessage msg = INFO_SEARCH_OPERATION_INVALID_PROTOCOL.get(opType);
                err.println(wrapText(msg, MAX_LINE_WIDTH));
            }

@@ -1188,9 +1187,7 @@
      int versionNumber = version.getIntValue();
      if(versionNumber != 2 && versionNumber != 3)
      {

        err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(
                String.valueOf(versionNumber)), MAX_LINE_WIDTH));
        err.println(wrapText(ERR_DESCRIPTION_INVALID_VERSION.get(versionNumber), MAX_LINE_WIDTH));
        return CLIENT_SIDE_PARAM_ERROR;
      }
      connectionOptions.setVersionNumber(versionNumber);
@@ -1355,8 +1352,7 @@
        String token = tokenizer.nextToken();
        if (! token.equals("ps"))
        {
          LocalizableMessage message = ERR_PSEARCH_DOESNT_START_WITH_PS.get(
                  String.valueOf(infoString));
          LocalizableMessage message = ERR_PSEARCH_DOESNT_START_WITH_PS.get(infoString);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return CLIENT_SIDE_PARAM_ERROR;
        }
@@ -1394,8 +1390,7 @@
          }
          else
          {
            LocalizableMessage message =
                    ERR_PSEARCH_INVALID_CHANGE_TYPE.get(String.valueOf(token));
            LocalizableMessage message = ERR_PSEARCH_INVALID_CHANGE_TYPE.get(token);
            err.println(wrapText(message, MAX_LINE_WIDTH));
            return CLIENT_SIDE_PARAM_ERROR;
          }
@@ -1424,8 +1419,7 @@
        }
        else
        {
          LocalizableMessage message = ERR_PSEARCH_INVALID_CHANGESONLY.get(
                  String.valueOf(token));
          LocalizableMessage message = ERR_PSEARCH_INVALID_CHANGESONLY.get(token);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return CLIENT_SIDE_PARAM_ERROR;
        }
@@ -1445,8 +1439,7 @@
        }
        else
        {
          LocalizableMessage message = ERR_PSEARCH_INVALID_RETURN_ECS.get(
                  String.valueOf(token));
          LocalizableMessage message = ERR_PSEARCH_INVALID_RETURN_ECS.get(token);
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return CLIENT_SIDE_PARAM_ERROR;
        }

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

@@ -59,6 +59,7 @@
import org.opends.server.types.ObjectClass;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.LDIFWriter;
import org.opends.server.util.StaticUtils;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.ArgumentParser;
import org.opends.server.util.args.BooleanArgument;
@@ -303,11 +304,7 @@
        }
        catch (Exception e)
        {

          LocalizableMessage message = ERR_LDIFDIFF_CANNOT_INITIALIZE_JMX.get(
                  String.valueOf(configFile.getValue()),
                                      e.getMessage());
          err.println(message);
          err.println(ERR_LDIFDIFF_CANNOT_INITIALIZE_JMX.get(configFile.getValue(), e.getMessage()));
          return OPERATIONS_ERROR;
        }

@@ -318,10 +315,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_LDIFDIFF_CANNOT_INITIALIZE_CONFIG.get(
                  String.valueOf(configFile.getValue()),
                                      e.getMessage());
          err.println(message);
          err.println(ERR_LDIFDIFF_CANNOT_INITIALIZE_CONFIG.get(configFile.getValue(), e.getMessage()));
          return OPERATIONS_ERROR;
        }

@@ -331,10 +325,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_LDIFDIFF_CANNOT_INITIALIZE_SCHEMA.get(
                  String.valueOf(configFile.getValue()),
                  e.getMessage());
          err.println(message);
          err.println(ERR_LDIFDIFF_CANNOT_INITIALIZE_SCHEMA.get(configFile.getValue(), e.getMessage()));
          return OPERATIONS_ERROR;
        }
      }
@@ -360,19 +351,12 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ATTRIBS.get(
                ignoreAttrsFile.getValue(),
                String.valueOf(e));
        err.println(message);
        err.println(ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ATTRIBS.get(ignoreAttrsFile.getValue(), e));
        return OPERATIONS_ERROR;
      }
      finally
      {
        try
        {
          ignReader.close();
        }
        catch (Exception e) {}
        StaticUtils.close(ignReader);
      }
    }

@@ -401,19 +385,12 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ENTRIES.get(
                ignoreEntriesFile.getValue(),
                String.valueOf(e));
        err.println(message);
        err.println(ERR_LDIFDIFF_CANNOT_READ_FILE_IGNORE_ENTRIES.get(ignoreEntriesFile.getValue(), e));
        return OPERATIONS_ERROR;
      }
      finally
      {
        try
        {
          ignReader.close();
        }
        catch (Exception e) {}
        StaticUtils.close(ignReader);
      }
    }

@@ -426,10 +403,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDIFDIFF_CANNOT_OPEN_SOURCE_LDIF.get(
              sourceLDIF.getValue(),
              String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFDIFF_CANNOT_OPEN_SOURCE_LDIF.get(sourceLDIF.getValue(), e));
      return OPERATIONS_ERROR;
    }

@@ -452,18 +426,12 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDIFDIFF_ERROR_READING_SOURCE_LDIF.get(
              sourceLDIF.getValue(),
              String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFDIFF_ERROR_READING_SOURCE_LDIF.get(sourceLDIF.getValue(), e));
      return OPERATIONS_ERROR;
    }
    finally
    {
      try
      {
        reader.close();
      } catch (Exception e) {}
      StaticUtils.close(reader);
    }


@@ -475,10 +443,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDIFDIFF_CANNOT_OPEN_TARGET_LDIF.get(
              targetLDIF.getValue(),
              String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFDIFF_CANNOT_OPEN_TARGET_LDIF.get(targetLDIF.getValue(), e));
      return OPERATIONS_ERROR;
    }

@@ -501,18 +466,12 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDIFDIFF_ERROR_READING_TARGET_LDIF.get(
              targetLDIF.getValue(),
              String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFDIFF_ERROR_READING_TARGET_LDIF.get(targetLDIF.getValue(), e));
      return OPERATIONS_ERROR;
    }
    finally
    {
      try
      {
        reader.close();
      } catch (Exception e) {}
      StaticUtils.close(reader);
    }


@@ -543,8 +502,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDIFDIFF_CANNOT_OPEN_OUTPUT.get(String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFDIFF_CANNOT_OPEN_OUTPUT.get(e));
      return OPERATIONS_ERROR;
    }

@@ -720,17 +678,12 @@
    }
    catch (IOException e)
    {
      LocalizableMessage message =
              ERR_LDIFDIFF_ERROR_WRITING_OUTPUT.get(String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFDIFF_ERROR_WRITING_OUTPUT.get(e));
      return OPERATIONS_ERROR;
    }
    finally
    {
      try
      {
        writer.close();
      } catch (Exception e) {}
      StaticUtils.close(writer);
    }



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

@@ -169,8 +169,7 @@
          // The entry must not exist in the add list.
          if (adds.containsKey(changeDN))
          {
            errorList.add(ERR_LDIFMODIFY_CANNOT_ADD_ENTRY_TWICE.get(
                    String.valueOf(changeDN)));
            errorList.add(ERR_LDIFMODIFY_CANNOT_ADD_ENTRY_TWICE.get(changeDN));
            continue;
          }
          else
@@ -185,8 +184,7 @@
          // them.
          if (adds.containsKey(changeDN))
          {
            errorList.add(ERR_LDIFMODIFY_CANNOT_DELETE_AFTER_ADD.get(
                    String.valueOf(changeDN)));
            errorList.add(ERR_LDIFMODIFY_CANNOT_DELETE_AFTER_ADD.get(changeDN));
            continue;
          }
          else
@@ -200,8 +198,7 @@
          // The entry must not exist in the add or delete lists.
          if (adds.containsKey(changeDN) || deletes.containsKey(changeDN))
          {
            errorList.add(ERR_LDIFMODIFY_CANNOT_MODIFY_ADDED_OR_DELETED.get(
                    String.valueOf(changeDN)));
            errorList.add(ERR_LDIFMODIFY_CANNOT_MODIFY_ADDED_OR_DELETED.get(changeDN));
            continue;
          }
          else
@@ -231,14 +228,11 @@
          break;

        case MODIFY_DN:
          errorList.add(ERR_LDIFMODIFY_MODDN_NOT_SUPPORTED.get(
                  String.valueOf(changeDN)));
          errorList.add(ERR_LDIFMODIFY_MODDN_NOT_SUPPORTED.get(changeDN));
          continue;

        default:
          errorList.add(ERR_LDIFMODIFY_UNKNOWN_CHANGETYPE.get(
                  String.valueOf(changeDN),
               String.valueOf(changeRecord.getChangeOperationType())));
          errorList.add(ERR_LDIFMODIFY_UNKNOWN_CHANGETYPE.get(changeDN, changeRecord.getChangeOperationType()));
          continue;
      }
    }
@@ -285,9 +279,7 @@
      // exists.
      if (adds.remove(entryDN) != null)
      {

        errorList.add(ERR_LDIFMODIFY_ADD_ALREADY_EXISTS.get(
                String.valueOf(entryDN)));
        errorList.add(ERR_LDIFMODIFY_ADD_ALREADY_EXISTS.get(entryDN));
        continue;
      }

@@ -372,8 +364,7 @@
    {
      for (DN dn : deletes.keySet())
      {
        errorList.add(
                ERR_LDIFMODIFY_DELETE_NO_SUCH_ENTRY.get(String.valueOf(dn)));
        errorList.add(ERR_LDIFMODIFY_DELETE_NO_SUCH_ENTRY.get(dn));
      }
    }

@@ -381,8 +372,7 @@
    {
      for (DN dn : modifications.keySet())
      {
        errorList.add(ERR_LDIFMODIFY_MODIFY_NO_SUCH_ENTRY.get(
                String.valueOf(dn)));
        errorList.add(ERR_LDIFMODIFY_MODIFY_NO_SUCH_ENTRY.get(dn));
      }
    }
    return targetWriter.writeEntries(ldifEntries.values()) &&
@@ -551,10 +541,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_LDIFMODIFY_CANNOT_INITIALIZE_JMX.get(
                  String.valueOf(configFile.getValue()),
                                      e.getMessage());
          err.println(message);
          err.println(ERR_LDIFMODIFY_CANNOT_INITIALIZE_JMX.get(configFile.getValue(), e.getMessage()));
          return 1;
        }

@@ -565,10 +552,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_LDIFMODIFY_CANNOT_INITIALIZE_CONFIG.get(
                  String.valueOf(configFile.getValue()),
                                      e.getMessage());
          err.println(message);
          err.println(ERR_LDIFMODIFY_CANNOT_INITIALIZE_CONFIG.get(configFile.getValue(), e.getMessage()));
          return 1;
        }

@@ -578,10 +562,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = ERR_LDIFMODIFY_CANNOT_INITIALIZE_SCHEMA.get(
                  String.valueOf(configFile.getValue()),
                                      e.getMessage());
          err.println(message);
          err.println(ERR_LDIFMODIFY_CANNOT_INITIALIZE_SCHEMA.get(configFile.getValue(), e.getMessage()));
          return 1;
        }
      }
@@ -606,10 +587,7 @@
    }
    catch (IOException ioe)
    {
      LocalizableMessage message = ERR_LDIFMODIFY_CANNOT_OPEN_SOURCE.get(
              sourceFile.getValue(),
                                  String.valueOf(ioe));
      err.println(message);
      err.println(ERR_LDIFMODIFY_CANNOT_OPEN_SOURCE.get(sourceFile.getValue(), ioe));
      return LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR;
    }

@@ -617,9 +595,7 @@
    File changes = new File(changesFile.getValue());
    if (! changes.exists())
    {
      LocalizableMessage message = ERR_LDIFMODIFY_CHANGES_DOES_NOT_EXIST.get(
              changesFile.getValue());
      err.println(message);
      err.println(ERR_LDIFMODIFY_CHANGES_DOES_NOT_EXIST.get(changesFile.getValue()));
      return LDAPResultCode.CLIENT_SIDE_PARAM_ERROR;
    }

@@ -665,10 +641,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDIFMODIFY_ERROR_PROCESSING_LDIF.get(
              String.valueOf(e));
      err.println(message);

      err.println(ERR_LDIFMODIFY_ERROR_PROCESSING_LDIF.get(e));
      successful = false;
    }


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

@@ -456,10 +456,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_LDIFSEARCH_CANNOT_INITIALIZE_JMX.get(
                String.valueOf(configFile.getValue()),
                e.getMessage());
        err.println(message);
        err.println(ERR_LDIFSEARCH_CANNOT_INITIALIZE_JMX.get(configFile.getValue(), e.getMessage()));
        return 1;
      }

@@ -470,10 +467,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_LDIFSEARCH_CANNOT_INITIALIZE_CONFIG.get(
                String.valueOf(configFile.getValue()),
                e.getMessage());
        err.println(message);
        err.println(ERR_LDIFSEARCH_CANNOT_INITIALIZE_CONFIG.get(configFile.getValue(), e.getMessage()));
        return 1;
      }

@@ -483,10 +477,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_LDIFSEARCH_CANNOT_INITIALIZE_SCHEMA.get(
                String.valueOf(configFile.getValue()),
                e.getMessage());
        err.println(message);
        err.println(ERR_LDIFSEARCH_CANNOT_INITIALIZE_SCHEMA.get(configFile.getValue(), e.getMessage()));
        return 1;
      }
    }
@@ -625,9 +616,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDIFSEARCH_CANNOT_PARSE_TIME_LIMIT.get(
              String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFSEARCH_CANNOT_PARSE_TIME_LIMIT.get(e));
      return 1;
    }

@@ -647,9 +636,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDIFSEARCH_CANNOT_PARSE_SIZE_LIMIT.get(
              String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFSEARCH_CANNOT_PARSE_SIZE_LIMIT.get(e));
      return 1;
    }

@@ -708,9 +695,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_LDIFSEARCH_CANNOT_CREATE_READER.get(
              String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFSEARCH_CANNOT_CREATE_READER.get(e));
      return 1;
    }

@@ -725,9 +710,7 @@
        reader.close();
      } catch (Exception e2) {}

      LocalizableMessage message = ERR_LDIFSEARCH_CANNOT_CREATE_WRITER.get(
              String.valueOf(e));
      err.println(message);
      err.println(ERR_LDIFSEARCH_CANNOT_CREATE_WRITER.get(e));
      return 1;
    }

@@ -855,9 +838,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_LDIFSEARCH_ERROR_DURING_PROCESSING.get(
                String.valueOf(e));
        err.println(message);
        err.println(ERR_LDIFSEARCH_ERROR_DURING_PROCESSING.get(e));
        resultCode = LDAPResultCode.CLIENT_SIDE_LOCAL_ERROR;
        break;
      }

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

@@ -575,14 +575,12 @@
      }
      catch (ConfigException ce)
      {
        LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
            String.valueOf(configEntry.getDN()), ce.getMessage());
        LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(configEntry.getDN(), ce.getMessage());
        throw new ConfigException(message, ce);
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(
            String.valueOf(configEntry.getDN()), getExceptionMessage(e));
        LocalizableMessage message = ERR_CANNOT_DETERMINE_BACKEND_ID.get(configEntry.getDN(), getExceptionMessage(e));
        throw new ConfigException(message, e);
      }

@@ -606,7 +604,7 @@
      catch (Exception e)
      {
        LocalizableMessage message = ERR_CANNOT_DETERMINE_BASES_FOR_BACKEND.get(
            String.valueOf(configEntry.getDN()), getExceptionMessage(e));
            configEntry.getDN(), getExceptionMessage(e));
        throw new ConfigException(message, e);
      }


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

@@ -620,7 +620,7 @@
          LocalizableMessage message =
               ERR_PWPSTATE_REQUEST_FAILED.get(resultCode,
                          LDAPResultCode.toString(resultCode),
                          String.valueOf(extendedResponse.getErrorMessage()));
                          extendedResponse.getErrorMessage());
          err.println(wrapText(message, MAX_LINE_WIDTH));
          return resultCode;
        }
@@ -776,8 +776,7 @@
              break;

            default:
              message = ERR_PWPSTATE_INVALID_RESPONSE_OP_TYPE.get(
                  String.valueOf(opType));
              message = ERR_PWPSTATE_INVALID_RESPONSE_OP_TYPE.get(opType);
              err.println(wrapText(message, MAX_LINE_WIDTH));
              break;
          }

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

@@ -134,22 +134,18 @@

      if (currentDate.after(notAfterDate))
      {
        LocalizableMessage message = WARN_PROMPTTM_CERT_EXPIRED.get(
                String.valueOf(notAfterDate));
        System.err.println(message);
        System.err.println(WARN_PROMPTTM_CERT_EXPIRED.get(notAfterDate));
      }
      else if (currentDate.before(notBeforeDate))
      {
        LocalizableMessage message = WARN_PROMPTTM_CERT_NOT_YET_VALID.get(
                String.valueOf(notBeforeDate));
        System.err.println(message);
        System.err.println(WARN_PROMPTTM_CERT_NOT_YET_VALID.get(notBeforeDate));
      }

      System.out.println(INFO_PROMPTTM_SERVER_CERT.get(
              chain[0].getSubjectDN().getName(),
              chain[0].getIssuerDN().getName(),
              String.valueOf(notBeforeDate),
              String.valueOf(notAfterDate)));
              notBeforeDate,
              notAfterDate));
    }



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

@@ -638,8 +638,7 @@
        final StringBuilder failureReason = new StringBuilder();
        if (!LockFileManager.releaseLock(lockFile, failureReason))
        {
          logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend
              .getBackendID(), String.valueOf(failureReason)));
          logger.warn(WARN_REBUILDINDEX_CANNOT_UNLOCK_BACKEND.get(backend.getBackendID(), failureReason));
        }
      }
      catch (Exception e)

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

@@ -506,36 +506,27 @@
                backupInfo.getBackupID());
        out.println(message);


        message = INFO_RESTOREDB_LIST_BACKUP_DATE.get(
                dateFormat.format(backupInfo.getBackupDate()));
        out.println(message);


        message = INFO_RESTOREDB_LIST_INCREMENTAL.get(
                String.valueOf(backupInfo.isIncremental()));
        message = INFO_RESTOREDB_LIST_INCREMENTAL.get(backupInfo.isIncremental());
        out.println(message);


        message = INFO_RESTOREDB_LIST_COMPRESSED.get(
                String.valueOf(backupInfo.isCompressed()));
        message = INFO_RESTOREDB_LIST_COMPRESSED.get(backupInfo.isCompressed());
        out.println(message);


        message = INFO_RESTOREDB_LIST_ENCRYPTED.get(
                String.valueOf(backupInfo.isEncrypted()));
        message = INFO_RESTOREDB_LIST_ENCRYPTED.get(backupInfo.isEncrypted());
        out.println(message);

        byte[] hash = backupInfo.getUnsignedHash();

        message = INFO_RESTOREDB_LIST_HASHED.get(
                String.valueOf(hash != null));
        message = INFO_RESTOREDB_LIST_HASHED.get(hash != null);
        out.println(message);

        byte[] signature = backupInfo.getSignedHash();

        message = INFO_RESTOREDB_LIST_SIGNED.get(
                String.valueOf(signature != null));
        message = INFO_RESTOREDB_LIST_SIGNED.get(signature != null);
        out.println(message);

        StringBuilder dependencyList = new StringBuilder();

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

@@ -708,8 +708,7 @@
    }
    catch (IOException ioe)
    {
      LocalizableMessage message = ERR_STOPDS_IO_ERROR.get(String.valueOf(ioe));
      err.println(wrapText(message, MAX_LINE_WIDTH));
      err.println(wrapText(ERR_STOPDS_IO_ERROR.get(ioe), MAX_LINE_WIDTH));
      return LDAPResultCode.CLIENT_SIDE_SERVER_DOWN;
    }
    catch (ASN1Exception ae)

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

@@ -292,10 +292,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = WARN_WAIT4DEL_CANNOT_OPEN_LOG_FILE.get(
                logFilePath.getValue(), String.valueOf(e));
        println(message);

        println(WARN_WAIT4DEL_CANNOT_OPEN_LOG_FILE.get(logFilePath.getValue(), e));
        logFile = null;
      }
    }
@@ -321,10 +318,7 @@
        }
        catch (Exception e)
        {
          LocalizableMessage message = WARN_WAIT4DEL_CANNOT_OPEN_OUTPUT_FILE.get(
                  outputFilePath.getValue(), String.valueOf(e));
          println(message);

          println(WARN_WAIT4DEL_CANNOT_OPEN_OUTPUT_FILE.get(outputFilePath.getValue(), e));
          outputFile = null;
        }
      }

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java

@@ -214,22 +214,19 @@
                  instanceof OpendsCertificateException)) ||
                  (e.getRootCause() instanceof SSLHandshakeException)) {
                  LocalizableMessage message =
                    ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED.get(
                    hostName, String.valueOf(portNumber));
                    ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED.get(hostName, portNumber);
                  throw new ClientException(
                    LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
                }
              }
              if (e.getRootCause() instanceof SSLException) {
                LocalizableMessage message =
                  ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(
                  hostName, String.valueOf(portNumber));
                  ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(hostName, portNumber);
                throw new ClientException(
                  LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
              }
            }
            LocalizableMessage message = ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(
              hostName, String.valueOf(portNumber));
            LocalizableMessage message = ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, portNumber);
            throw new ClientException(
              LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
          }
@@ -280,13 +277,13 @@
              else
              {
                LocalizableMessage message = ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(
                    hostName, String.valueOf(portNumber));
                    hostName, portNumber);
                throw new ClientException(
                    LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
              }
            }
            LocalizableMessage message = ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(
                hostName, String.valueOf(portNumber));
                hostName, portNumber);
            throw new ClientException(
                LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
          }
@@ -317,7 +314,7 @@
        catch (CommunicationException e)
        {
          LocalizableMessage message = ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(
              hostName, String.valueOf(portNumber));
              hostName, portNumber);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR,
              message);
        }

 opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -1829,9 +1829,7 @@
            if (replicationPort1 == port1)
            {
              println();
              println(
                  ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
                      host1, String.valueOf(replicationPort1)));
              println(ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(host1, replicationPort1));
              println();
              replicationPort1 = -1;
            }
@@ -1842,8 +1840,8 @@
          try
          {
            secureReplication1 =
              askConfirmation(INFO_REPLICATION_ENABLE_SECURE1_PROMPT.get(
                String.valueOf(replicationPort1)), false, logger);
              askConfirmation(INFO_REPLICATION_ENABLE_SECURE1_PROMPT.get(replicationPort1),
                  false, logger);
          }
          catch (CLIException ce)
          {
@@ -1979,8 +1977,7 @@
          if (port1 == port2)
          {
            port2 = -1;
            LocalizableMessage message = ERR_REPLICATION_ENABLE_SAME_SERVER_PORT.get(
                host1, String.valueOf(port1));
            LocalizableMessage message = ERR_REPLICATION_ENABLE_SAME_SERVER_PORT.get(host1, port1);
            println();
            println(message);
            println();
@@ -2122,9 +2119,7 @@
              if (replicationPort2 == port2)
              {
                println();
                println(
                    ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
                        host2, String.valueOf(replicationPort2)));
                println(ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(host2, replicationPort2));
                replicationPort2 = -1;
              }
            }
@@ -2134,8 +2129,7 @@
                  (replicationPort1 == replicationPort2))
              {
                println();
                println(ERR_REPLICATION_SAME_REPLICATION_PORT.get(
                    String.valueOf(replicationPort2), host1));
                println(ERR_REPLICATION_SAME_REPLICATION_PORT.get(replicationPort2, host1));
                println();
                replicationPort2 = -1;
              }
@@ -2146,8 +2140,7 @@
            try
            {
              secureReplication2 =
                askConfirmation(INFO_REPLICATION_ENABLE_SECURE2_PROMPT.get(
                    String.valueOf(replicationPort2)), false, logger);
                askConfirmation(INFO_REPLICATION_ENABLE_SECURE2_PROMPT.get(replicationPort2), false, logger);
            }
            catch (CLIException ce)
            {
@@ -3032,8 +3025,7 @@
          if (portSource == portDestination)
          {
            portDestination = -1;
            LocalizableMessage message = ERR_REPLICATION_INITIALIZE_SAME_SERVER_PORT.get(
                hostSource, String.valueOf(portSource));
            LocalizableMessage message = ERR_REPLICATION_INITIALIZE_SAME_SERVER_PORT.get(hostSource, portSource);
            println();
            println(message);
            println();
@@ -4085,8 +4077,7 @@
            (replPort1 == replPort2) &&
            (host1.equalsIgnoreCase(host2)))
        {
          errorMessages.add(ERR_REPLICATION_SAME_REPLICATION_PORT.get(
              String.valueOf(replPort1), host1));
          errorMessages.add(ERR_REPLICATION_SAME_REPLICATION_PORT.get(replPort1, host1));
        }

        if (argParser.skipReplicationPortCheck())
@@ -4096,15 +4087,13 @@
          if (checkReplicationPort1 && replPort1 == port1)
          {
            errorMessages.add(
                ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
                host1, String.valueOf(replPort1)));
                ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(host1, replPort1));
          }

          if (checkReplicationPort2 && replPort2 == port2)
          {
            errorMessages.add(
                ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(
                host2, String.valueOf(replPort2)));
                ERR_REPLICATION_PORT_AND_REPLICATION_PORT_EQUAL.get(host2, replPort2));
          }
        }
      }
@@ -4197,8 +4186,7 @@
          println(INFO_WARNING_SERVERS_CLOCK_DIFFERENCE.get(
              ConnectionUtils.getHostPort(ctx1),
              ConnectionUtils.getHostPort(ctx2),
              String.valueOf(
                  Installer.THRESHOLD_CLOCK_DIFFERENCE_WARNING)));
              Installer.THRESHOLD_CLOCK_DIFFERENCE_WARNING));
        }
      }
      printlnProgress();
@@ -8412,8 +8400,7 @@
          if (processed + unprocessed > 0)
          {
            long perc = (100 * processed) / (processed + unprocessed);
            msg = INFO_INITIALIZE_PROGRESS_WITH_PERCENTAGE.get(sProcessed,
                String.valueOf(perc));
            msg = INFO_INITIALIZE_PROGRESS_WITH_PERCENTAGE.get(sProcessed, perc);
          }
          else
          {

 opendj3-server-dev/src/server/org/opends/server/tools/makeldif/FileTag.java

@@ -228,7 +228,7 @@
    catch (IOException ioe)
    {
      LocalizableMessage message = ERR_MAKELDIF_TAG_CANNOT_READ_FILE.get(
          arguments[0], getName(), lineNumber, String.valueOf(ioe));
          arguments[0], getName(), lineNumber, ioe);
      throw new InitializationException(message, ioe);
    }
  }

 opendj3-server-dev/src/server/org/opends/server/tools/makeldif/MakeLDIF.java

@@ -248,8 +248,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_MAKELDIF_CANNOT_INITIALIZE_JMX.get(
            String.valueOf(configFile.getValue()), e.getMessage());
        LocalizableMessage message = ERR_MAKELDIF_CANNOT_INITIALIZE_JMX.get(configFile.getValue(), e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -261,8 +260,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG.get(
            String.valueOf(configFile.getValue()), e.getMessage());
        LocalizableMessage message = ERR_MAKELDIF_CANNOT_INITIALIZE_CONFIG.get(configFile.getValue(), e.getMessage());
        err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -276,8 +274,7 @@
      }
      catch (Exception e)
      {
        LocalizableMessage message = ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA.get(
            String.valueOf(configFile.getValue()), e.getMessage());
        LocalizableMessage message = ERR_MAKELDIF_CANNOT_INITIALIZE_SCHEMA.get(configFile.getValue(), e.getMessage());
        System.err.println(wrapText(message, MAX_LINE_WIDTH));
        return 1;
      }
@@ -359,8 +356,7 @@
    }
    catch (IOException ioe)
    {
      LocalizableMessage message = ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF.get(
              ldifFile.getValue(), String.valueOf(ioe));
      LocalizableMessage message = ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF.get(ldifFile.getValue(), ioe);
      err.println(wrapText(message, MAX_LINE_WIDTH));
      return 1;
    }
@@ -465,7 +461,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_MAKELDIF_CANNOT_WRITE_ENTRY.get(
          String.valueOf(entry.getDN()), stackTraceToSingleLineString(e));
          entry.getDN(), stackTraceToSingleLineString(e));
      throw new MakeLDIFException(message, e);
    }
  }

 opendj3-server-dev/src/server/org/opends/server/tools/makeldif/TemplateFile.java

@@ -827,8 +827,7 @@
        DN branchDN = b.getBranchDN();
        if (templateFileBranches.containsKey(branchDN))
        {
          LocalizableMessage message = ERR_MAKELDIF_CONFLICTING_BRANCH_DN.get(
              String.valueOf(branchDN), startLineNumber);
          LocalizableMessage message = ERR_MAKELDIF_CONFLICTING_BRANCH_DN.get(branchDN, startLineNumber);
          throw new MakeLDIFException(message);
        }
        else
@@ -871,8 +870,7 @@
        String lowerName = toLowerCase(t.getName());
        if (templateFileTemplates.containsKey(lowerName))
        {
          LocalizableMessage message = ERR_MAKELDIF_CONFLICTING_TEMPLATE_NAME.get(
              String.valueOf(t.getName()), startLineNumber);
          LocalizableMessage message = ERR_MAKELDIF_CONFLICTING_TEMPLATE_NAME.get(t.getName(), startLineNumber);
          throw new MakeLDIFException(message);
        }
        else
@@ -1307,7 +1305,7 @@
      else
      {
        LocalizableMessage message = ERR_MAKELDIF_NO_COLON_IN_BRANCH_EXTRA_LINE.get(
            lineNumber, String.valueOf(branch.getBranchDN()));
            lineNumber, branch.getBranchDN());
        throw new MakeLDIFException(message);
      }
    }
@@ -1322,7 +1320,7 @@
      else
      {
        LocalizableMessage message = ERR_MAKELDIF_NO_ATTR_IN_BRANCH_EXTRA_LINE.get(
            lineNumber, String.valueOf(branch.getBranchDN()));
            lineNumber, branch.getBranchDN());
        throw new MakeLDIFException(message);
      }
    }
@@ -1369,7 +1367,7 @@
      else
      {
        LocalizableMessage message = WARN_MAKELDIF_NO_VALUE_IN_BRANCH_EXTRA_LINE.get(
                lineNumber, String.valueOf(branch.getBranchDN()));
                lineNumber, branch.getBranchDN());
        warnings.add(message);
      }
    }
@@ -1565,9 +1563,7 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG.get(
          tagName, lineNumber, String.valueOf(e));
      throw new MakeLDIFException(message, e);
      throw new MakeLDIFException(ERR_MAKELDIF_CANNOT_INSTANTIATE_NEW_TAG.get(tagName, lineNumber, e), e);
    }



 opendj3-server-dev/src/server/org/opends/server/tools/tasks/TaskTool.java

@@ -363,7 +363,7 @@
        if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
        ret = 1;
      } catch (IOException ioe) {
        LocalizableMessage message = ERR_TASK_TOOL_IO_ERROR.get(String.valueOf(ioe));
        LocalizableMessage message = ERR_TASK_TOOL_IO_ERROR.get(ioe);
        if (err != null) err.println(wrapText(message, MAX_LINE_WIDTH));
        ret = 1;
      } catch (ASN1Exception ae) {

 opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeTasks.java

@@ -844,8 +844,7 @@
  {
    if (changeCount != 0)
    {
      logger.debug(INFO_UPGRADE_CHANGE_DONE_IN_SPECIFIC_FILE.get(
          fileName, String.valueOf(changeCount)));
      logger.debug(INFO_UPGRADE_CHANGE_DONE_IN_SPECIFIC_FILE.get(fileName, changeCount));
    }
    else
    {

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

@@ -175,8 +175,7 @@
            .getEqualityMatchingRule();
        if (equalityMatchingRule == null)
        {
          LocalizableMessage message = ERR_ATTR_TYPE_NORMALIZE_NO_MR.get(String
              .valueOf(value), attributeType.getNameOrOID());
          LocalizableMessage message = ERR_ATTR_TYPE_NORMALIZE_NO_MR.get(value, attributeType.getNameOrOID());
          throw new DirectoryException(
              ResultCode.INAPPROPRIATE_MATCHING, message);
        }

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

@@ -2306,11 +2306,8 @@
      {
        logger.traceException(e);

        LocalizableMessage message =
            ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.
              get(dnString, String.valueOf(e));
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(dnString, e));
      }
    }

@@ -2549,10 +2546,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.
          get(dnString, String.valueOf(e));
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                   message);
          ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(dnString, e));
    }
  }


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

@@ -304,8 +304,7 @@
      ObjectClass oc = DirectoryServer.getObjectClass(lowerName);
      if (oc == null)
      {
        LocalizableMessage message =
            ERR_ENTRY_ADD_UNKNOWN_OC.get(name, String.valueOf(dn));
        LocalizableMessage message = ERR_ENTRY_ADD_UNKNOWN_OC.get(name, dn);
        throw new DirectoryException(OBJECTCLASS_VIOLATION, message);
      }

@@ -337,8 +336,7 @@

    if (objectClasses.containsKey(oc))
    {
      LocalizableMessage message = ERR_ENTRY_ADD_DUPLICATE_OC.get(
          oc.getNameOrOID(), String.valueOf(dn));
      LocalizableMessage message = ERR_ENTRY_ADD_DUPLICATE_OC.get(oc.getNameOrOID(), dn);
      throw new DirectoryException(OBJECTCLASS_VIOLATION, message);
    }

@@ -1683,8 +1681,7 @@
          throw new DirectoryException(CONSTRAINT_VIOLATION, message);

        default:
          message = ERR_ENTRY_UNKNOWN_MODIFICATION_TYPE.get(
              String.valueOf(mod.getModificationType()));
          message = ERR_ENTRY_UNKNOWN_MODIFICATION_TYPE.get(mod.getModificationType());
          throw new DirectoryException(UNWILLING_TO_PERFORM, message);
      }

@@ -1722,8 +1719,7 @@
        break;

      default:
        LocalizableMessage message = ERR_ENTRY_UNKNOWN_MODIFICATION_TYPE.get(
            String.valueOf(mod.getModificationType()));
        LocalizableMessage message = ERR_ENTRY_UNKNOWN_MODIFICATION_TYPE.get(mod.getModificationType());
        throw new DirectoryException(UNWILLING_TO_PERFORM, message);
    }
  }
@@ -1839,7 +1835,7 @@
        {
          LocalizableMessage message =
                  ERR_ENTRY_SCHEMA_MULTIPLE_STRUCTURAL_CLASSES.get(
                    String.valueOf(dn),
                    dn,
                    structuralClass.getNameOrOID(),
                    oc.getNameOrOID());

@@ -1863,9 +1859,7 @@
    DITStructureRule ditStructureRule = null;
    if (structuralClass == null)
    {
      LocalizableMessage message = ERR_ENTRY_SCHEMA_NO_STRUCTURAL_CLASS.get(
              String.valueOf(dn));

      LocalizableMessage message = ERR_ENTRY_SCHEMA_NO_STRUCTURAL_CLASS.get(dn);
      if (structuralPolicy == AcceptRejectWarn.REJECT)
      {
        invalidReason.append(message);
@@ -1988,8 +1982,7 @@
    {
      if (DirectoryServer.getObjectClass(o.getOID()) == null)
      {
        LocalizableMessage message = ERR_ENTRY_SCHEMA_UNKNOWN_OC.get(
                String.valueOf(dn), o.getNameOrOID());
        LocalizableMessage message = ERR_ENTRY_SCHEMA_UNKNOWN_OC.get(dn, o.getNameOrOID());
        invalidReason.append(message);
        return false;
      }
@@ -2000,7 +1993,7 @@
      {
        LocalizableMessage message =
                ERR_ENTRY_SCHEMA_DISALLOWED_AUXILIARY_CLASS.get(
                  String.valueOf(dn),
                  dn,
                  o.getNameOrOID(),
                  ditContentRule.getName());
        if (structuralPolicy == AcceptRejectWarn.REJECT)
@@ -2022,7 +2015,7 @@
        {
          LocalizableMessage message =
                  ERR_ENTRY_SCHEMA_MISSING_REQUIRED_ATTR_FOR_OC.get(
                    String.valueOf(dn),
                    dn,
                    t.getNameOrOID(),
                    o.getNameOrOID());
          invalidReason.append(message);
@@ -2056,9 +2049,7 @@
      if (! found)
      {
        LocalizableMessage message =
                ERR_ENTRY_SCHEMA_DISALLOWED_USER_ATTR_FOR_OC.get(
                  String.valueOf(dn),
                  t.getNameOrOID());
                ERR_ENTRY_SCHEMA_DISALLOWED_USER_ATTR_FOR_OC.get( dn, t.getNameOrOID());
        invalidReason.append(message);
        return false;
      }
@@ -2070,20 +2061,12 @@
        {
          if (a.isEmpty())
          {
            LocalizableMessage message = ERR_ENTRY_SCHEMA_ATTR_NO_VALUES.get(
                    String.valueOf(dn),
                    t.getNameOrOID());

            invalidReason.append(message);
            invalidReason.append(ERR_ENTRY_SCHEMA_ATTR_NO_VALUES.get(dn, t.getNameOrOID()));
            return false;
          }
          else if (t.isSingleValue() && (a.size() != 1))
          {
            LocalizableMessage message = ERR_ENTRY_SCHEMA_ATTR_SINGLE_VALUED.get(
                    String.valueOf(dn),
                    t.getNameOrOID());

            invalidReason.append(message);
            invalidReason.append(ERR_ENTRY_SCHEMA_ATTR_SINGLE_VALUED.get(dn, t.getNameOrOID()));
            return false;
          }
        }
@@ -2104,12 +2087,7 @@
          {
            if (a.size() > 1)
            {
              LocalizableMessage message =
                      ERR_ENTRY_SCHEMA_ATTR_SINGLE_VALUED.get(
                        String.valueOf(dn),
                        t.getNameOrOID());

              invalidReason.append(message);
              invalidReason.append(ERR_ENTRY_SCHEMA_ATTR_SINGLE_VALUED.get(dn, t.getNameOrOID()));
              return false;
            }
          }
@@ -2151,7 +2129,7 @@
          {
            LocalizableMessage message =
                    ERR_ENTRY_SCHEMA_RDN_MISSING_REQUIRED_ATTR.get(
                      String.valueOf(dn),
                      dn,
                      t.getNameOrOID(),
                      nameForm.getNameOrOID());

@@ -2176,7 +2154,7 @@
            {
              LocalizableMessage message =
                      ERR_ENTRY_SCHEMA_RDN_DISALLOWED_ATTR.get(
                        String.valueOf(dn),
                        dn,
                        t.getNameOrOID(),
                        nameForm.getNameOrOID());

@@ -2225,7 +2203,7 @@
      {
        LocalizableMessage message =
                ERR_ENTRY_SCHEMA_MISSING_REQUIRED_ATTR_FOR_DCR.get(
                  String.valueOf(dn),
                  dn,
                  t.getNameOrOID(),
                  ditContentRule.getName());

@@ -2249,7 +2227,7 @@
      {
        LocalizableMessage message =
                ERR_ENTRY_SCHEMA_PROHIBITED_ATTR_FOR_DCR.get(
                  String.valueOf(dn),
                  dn,
                  t.getNameOrOID(),
                  ditContentRule.getName());

@@ -2331,9 +2309,7 @@
          final Lock lock = LockManager.lockRead(parentDN);
          if (lock == null)
          {
            LocalizableMessage message =
                    ERR_ENTRY_SCHEMA_DSR_COULD_NOT_LOCK_PARENT.get(
                      String.valueOf(dn), String.valueOf(parentDN));
            LocalizableMessage message = ERR_ENTRY_SCHEMA_DSR_COULD_NOT_LOCK_PARENT.get(dn, parentDN);

            if (structuralPolicy == AcceptRejectWarn.REJECT)
            {
@@ -2352,10 +2328,7 @@
              parentEntry = DirectoryServer.getEntry(parentDN);
              if (parentEntry == null)
              {
                LocalizableMessage message =
                     ERR_ENTRY_SCHEMA_DSR_NO_PARENT_ENTRY.get(
                             String.valueOf(dn),
                             String.valueOf(parentDN));
                LocalizableMessage message = ERR_ENTRY_SCHEMA_DSR_NO_PARENT_ENTRY.get(dn, parentDN);

                if (structuralPolicy == AcceptRejectWarn.REJECT)
                {
@@ -2387,7 +2360,7 @@

              LocalizableMessage message =
                   ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_DSR.get(
                           String.valueOf(dn),
                           dn,
                           ditStructureRule.getNameOrRuleID(),
                           getExceptionMessage(e));

@@ -2431,9 +2404,7 @@
          if (lock == null)
          {
            LocalizableMessage message =
                    ERR_ENTRY_SCHEMA_DSR_COULD_NOT_LOCK_PARENT.get(
                      String.valueOf(dn),
                      String.valueOf(parentDN));
                ERR_ENTRY_SCHEMA_DSR_COULD_NOT_LOCK_PARENT.get(dn, parentDN);

            if (structuralPolicy == AcceptRejectWarn.REJECT)
            {
@@ -2454,8 +2425,7 @@
              {
                LocalizableMessage message =
                     ERR_ENTRY_SCHEMA_DSR_NO_PARENT_ENTRY.get(
                             String.valueOf(dn),
                             String.valueOf(parentDN));
                         dn, parentDN);

                if (structuralPolicy == AcceptRejectWarn.REJECT)
                {
@@ -2479,8 +2449,7 @@

              LocalizableMessage message =
                   ERR_ENTRY_SCHEMA_COULD_NOT_CHECK_PARENT_DSR.get(
                           String.valueOf(dn),
                           getExceptionMessage(e));
                       dn, getExceptionMessage(e));

              if (structuralPolicy == AcceptRejectWarn.REJECT)
              {
@@ -2505,8 +2474,7 @@
        if (parentStructuralClass == null)
        {
          LocalizableMessage message = ERR_ENTRY_SCHEMA_DSR_NO_PARENT_OC.get(
                  String.valueOf(dn),
                  String.valueOf(parentEntry.getName()));
              dn, parentEntry.getName());

          if (structuralPolicy == AcceptRejectWarn.REJECT)
          {
@@ -2533,9 +2501,7 @@
                if (parentDSR != null && !parentDSR.isObsolete())
                {
                  LocalizableMessage message =
                       ERR_ENTRY_SCHEMA_VIOLATES_PARENT_DSR.get(
                               String.valueOf(dn),
                               String.valueOf(parentEntry.getName()));
                       ERR_ENTRY_SCHEMA_VIOLATES_PARENT_DSR.get(dn, parentEntry.getName());

                  if (structuralPolicy == AcceptRejectWarn.REJECT)
                  {
@@ -2588,8 +2554,7 @@
    if (oc == null)
    {
      LocalizableMessage message = ERR_ENTRY_SCHEMA_DSR_NO_PARENT_OC.get(
              String.valueOf(dn),
              String.valueOf(parentEntry.getName()));
          dn, parentEntry.getName());

      if (structuralPolicy == AcceptRejectWarn.REJECT)
      {
@@ -2615,7 +2580,7 @@
    {
      LocalizableMessage message =
              ERR_ENTRY_SCHEMA_DSR_DISALLOWED_SUPERIOR_OC.get(
                String.valueOf(dn),
                dn,
                dsr.getNameOrRuleID(),
                structuralClass.getNameOrOID(),
                oc.getNameOrOID());
@@ -4114,11 +4079,7 @@
    catch (Exception e)
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_EXPORT.
            get(String.valueOf(dn), String.valueOf(e));
      throw new LDIFException(message, e);
      throw new LDIFException(ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_EXPORT.get(dn, e), e);
    }



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

@@ -1006,8 +1006,7 @@
  {
    if ((modeString == null) || (modeString.length() != 3))
    {
      LocalizableMessage message = ERR_FILEPERM_INVALID_UNIX_MODE_STRING.get(
          String.valueOf(modeString));
      LocalizableMessage message = ERR_FILEPERM_INVALID_UNIX_MODE_STRING.get(modeString);
      throw new DirectoryException(ResultCode.OTHER, message);
    }

@@ -1039,8 +1038,7 @@
                             OWNER_EXECUTABLE;
        break;
      default:
      LocalizableMessage message = ERR_FILEPERM_INVALID_UNIX_MODE_STRING.get(
          String.valueOf(modeString));
      LocalizableMessage message = ERR_FILEPERM_INVALID_UNIX_MODE_STRING.get(modeString);
      throw new DirectoryException(ResultCode.OTHER, message);
    }

@@ -1071,8 +1069,7 @@
                             GROUP_EXECUTABLE;
        break;
      default:
      LocalizableMessage message = ERR_FILEPERM_INVALID_UNIX_MODE_STRING.get(
          String.valueOf(modeString));
      LocalizableMessage message = ERR_FILEPERM_INVALID_UNIX_MODE_STRING.get(modeString);
      throw new DirectoryException(ResultCode.OTHER, message);
    }

@@ -1103,8 +1100,7 @@
                             OTHER_EXECUTABLE;
        break;
      default:
      LocalizableMessage message = ERR_FILEPERM_INVALID_UNIX_MODE_STRING.get(
          String.valueOf(modeString));
      LocalizableMessage message = ERR_FILEPERM_INVALID_UNIX_MODE_STRING.get(modeString);
      throw new DirectoryException(ResultCode.OTHER, message);
    }


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

@@ -333,13 +333,12 @@
    int schemeEndPos = url.indexOf("://");
    if (schemeEndPos < 0)
    {
      LocalizableMessage message =
          ERR_LDAPURL_NO_COLON_SLASH_SLASH.get(String.valueOf(url));
      LocalizableMessage message = ERR_LDAPURL_NO_COLON_SLASH_SLASH.get(url);
      throw new DirectoryException(INVALID_ATTRIBUTE_SYNTAX, message);
    }
    else if (schemeEndPos == 0)
    {
      LocalizableMessage message = ERR_LDAPURL_NO_SCHEME.get(String.valueOf(url));
      LocalizableMessage message = ERR_LDAPURL_NO_SCHEME.get(url);
      throw new DirectoryException(INVALID_ATTRIBUTE_SYNTAX, message);
    }
    else
@@ -385,12 +384,12 @@
      }
      else if (colonPos == 0)
      {
        LocalizableMessage message = ERR_LDAPURL_NO_HOST.get(String.valueOf(url));
        LocalizableMessage message = ERR_LDAPURL_NO_HOST.get(url);
        throw new DirectoryException(INVALID_ATTRIBUTE_SYNTAX, message);
      }
      else if (colonPos == (hostPort.length() - 1))
      {
        LocalizableMessage message = ERR_LDAPURL_NO_PORT.get(String.valueOf(url));
        LocalizableMessage message = ERR_LDAPURL_NO_PORT.get(url);
        throw new DirectoryException(INVALID_ATTRIBUTE_SYNTAX, message);
      }
      else
@@ -404,13 +403,12 @@
        catch (NumberFormatException e)
        {
          LocalizableMessage message = ERR_LDAPURL_CANNOT_DECODE_PORT.get(
              String.valueOf(url), hostPort.substring(colonPos+1));
              url, hostPort.substring(colonPos+1));
          throw new DirectoryException(INVALID_ATTRIBUTE_SYNTAX, message);
        }
        catch (IllegalArgumentException e)
        {
          LocalizableMessage message =
              ERR_LDAPURL_INVALID_PORT.get(String.valueOf(url), port);
          LocalizableMessage message = ERR_LDAPURL_INVALID_PORT.get(url, port);
          throw new DirectoryException(INVALID_ATTRIBUTE_SYNTAX, message);
        }
      }
@@ -553,8 +551,7 @@
    }
    else
    {
      LocalizableMessage message = ERR_LDAPURL_INVALID_SCOPE_STRING.get(
          String.valueOf(url), String.valueOf(scopeString));
      LocalizableMessage message = ERR_LDAPURL_INVALID_SCOPE_STRING.get(url, scopeString);
      throw new DirectoryException(
                     ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
    }
@@ -677,8 +674,7 @@
        // a problem.
        if (i+2 > length)
        {
          LocalizableMessage message = ERR_LDAPURL_PERCENT_TOO_CLOSE_TO_END.get(
              String.valueOf(s), i);
          LocalizableMessage message = ERR_LDAPURL_PERCENT_TOO_CLOSE_TO_END.get(s, i);
          throw new DirectoryException(
                        ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }
@@ -741,11 +737,8 @@
            b = (byte) 0xF0;
            break;
          default:
            LocalizableMessage message = ERR_LDAPURL_INVALID_HEX_BYTE.get(
                String.valueOf(s), i);
            throw new DirectoryException(
                           ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                           message);
            LocalizableMessage message = ERR_LDAPURL_INVALID_HEX_BYTE.get(s, i);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }

        switch (stringBytes[++i])
@@ -804,11 +797,8 @@
            b |= 0x0F;
            break;
          default:
            LocalizableMessage message = ERR_LDAPURL_INVALID_HEX_BYTE.get(
                String.valueOf(s), i);
            throw new DirectoryException(
                           ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                           message);
            LocalizableMessage message = ERR_LDAPURL_INVALID_HEX_BYTE.get(s, i);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
        }

        decodedBytes[pos++] = b;

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

@@ -91,9 +91,7 @@
    {
      if (! isAlpha(name.charAt(i)))
      {
        LocalizableMessage message = ERR_CHARSET_CONSTRUCTOR_INVALID_NAME_CHAR.
            get(String.valueOf(name.charAt(i)), i);
        throw new ConfigException(message);
        throw new ConfigException(ERR_CHARSET_CONSTRUCTOR_INVALID_NAME_CHAR.get(name.charAt(i), i));
      }
    }
  }
@@ -130,9 +128,7 @@
    {
      if (! isAlpha(name.charAt(i)))
      {
        LocalizableMessage message = ERR_CHARSET_CONSTRUCTOR_INVALID_NAME_CHAR.
            get(String.valueOf(name.charAt(i)), i);
        throw new ConfigException(message);
        throw new ConfigException(ERR_CHARSET_CONSTRUCTOR_INVALID_NAME_CHAR.get(name.charAt(i), i));
      }
    }
  }
@@ -242,21 +238,15 @@
      int colonPos = value.indexOf(':');
      if (colonPos < 0)
      {
        LocalizableMessage message =
            ERR_CHARSET_NO_COLON.get(String.valueOf(value));
        throw new ConfigException(message);
        throw new ConfigException(ERR_CHARSET_NO_COLON.get(value));
      }
      else if (colonPos == 0)
      {
        LocalizableMessage message =
            ERR_CHARSET_NO_NAME.get(String.valueOf(value));
        throw new ConfigException(message);
        throw new ConfigException(ERR_CHARSET_NO_NAME.get(value));
      }
      else if (colonPos == (value.length() - 1))
      {
        LocalizableMessage message =
            ERR_CHARSET_NO_CHARS.get(String.valueOf(value));
        throw new ConfigException(message);
        throw new ConfigException(ERR_CHARSET_NO_CHARS.get(value));
      }
      else
      {

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

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

      LocalizableMessage message =
          ERR_LDAP_ATTRIBUTE_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_ATTRIBUTE_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -256,8 +255,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_ATTRIBUTE_DECODE_TYPE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_ATTRIBUTE_DECODE_TYPE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -277,8 +275,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_ATTRIBUTE_DECODE_VALUES.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_ATTRIBUTE_DECODE_VALUES.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -290,8 +287,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_ATTRIBUTE_DECODE_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_ATTRIBUTE_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }


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

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

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_COMPOUND_COMPONENTS.
          get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_COMPOUND_COMPONENTS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -689,8 +688,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_FILTER_DECODE_NOT_COMPONENT.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_NOT_COMPONENT.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -760,8 +758,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_FILTER_DECODE_TV_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_TV_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -774,8 +771,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_FILTER_DECODE_TV_TYPE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_TV_TYPE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -789,8 +785,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_FILTER_DECODE_TV_VALUE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_TV_VALUE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -802,8 +797,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_FILTER_DECODE_TV_SEQUENCE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_TV_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -836,8 +830,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_SEQUENCE.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -851,8 +844,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_TYPE.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_TYPE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -864,8 +856,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_ELEMENTS.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_ELEMENTS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -912,8 +903,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_VALUES.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_VALUES.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -925,8 +915,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_ELEMENTS.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_ELEMENTS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -938,12 +927,10 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_SEQUENCE.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_SUBSTRING_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }


    return new LDAPFilter(FilterType.SUBSTRING, null, null,
                          attributeType, null, subInitialElement,
                          subAnyElements, subFinalElement, null,
@@ -974,8 +961,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_FILTER_DECODE_PRESENCE_TYPE.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_PRESENCE_TYPE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1008,8 +994,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_EXTENSIBLE_SEQUENCE.
          get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_EXTENSIBLE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1040,8 +1025,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_EXTENSIBLE_ELEMENTS.
          get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_EXTENSIBLE_ELEMENTS.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -1053,8 +1037,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_EXTENSIBLE_SEQUENCE.
          get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_FILTER_DECODE_EXTENSIBLE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }


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

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

      LocalizableMessage message = ERR_LDAP_MODIFICATION_DECODE_SEQUENCE.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFICATION_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -291,8 +290,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_MODIFICATION_DECODE_MOD_TYPE.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFICATION_DECODE_MOD_TYPE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -306,8 +304,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message =
          ERR_LDAP_MODIFICATION_DECODE_ATTR.get(String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFICATION_DECODE_ATTR.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }

@@ -319,8 +316,7 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_LDAP_MODIFICATION_DECODE_SEQUENCE.get(
          String.valueOf(e));
      LocalizableMessage message = ERR_LDAP_MODIFICATION_DECODE_SEQUENCE.get(e);
      throw new LDAPException(PROTOCOL_ERROR, message, e);
    }


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

@@ -3515,8 +3515,7 @@
      // changes could potentially be sent to the other servers again
      // when this server is restarted, which shouldn't hurt anything.
      // Still, we should log a warning message.
      logger.error(ERR_SCHEMA_CANNOT_WRITE_CONCAT_SCHEMA_FILE.get(String
          .valueOf(concatFilePath), getExceptionMessage(e)));
      logger.error(ERR_SCHEMA_CANNOT_WRITE_CONCAT_SCHEMA_FILE.get(concatFilePath, getExceptionMessage(e)));
    }
  }


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

@@ -634,10 +634,8 @@
    {
      logger.traceException(e);

      LocalizableMessage message = ERR_SEARCH_FILTER_UNCAUGHT_EXCEPTION.get(
          filterString, String.valueOf(e));
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message,
                                   e);
      LocalizableMessage message = ERR_SEARCH_FILTER_UNCAUGHT_EXCEPTION.get(filterString, e);
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message, e);
    }
  }

@@ -2261,8 +2259,7 @@
      case UNDEFINED:
        return false;
      default:
        logger.error(ERR_SEARCH_FILTER_INVALID_RESULT_TYPE, String.valueOf(entry.getName()), toString(),
                String.valueOf(result));
        logger.error(ERR_SEARCH_FILTER_INVALID_RESULT_TYPE, entry.getName(), this, result);
        return false;
    }
  }
@@ -2365,12 +2362,8 @@
      // The set of subcomponents was null.  This is not allowed.
      LocalizableMessage message =
          ERR_SEARCH_FILTER_COMPOUND_COMPONENTS_NULL.
            get(String.valueOf(entry.getName()),
                String.valueOf(completeFilter),
                String.valueOf(filterType));
      throw new DirectoryException(
                     DirectoryServer.getServerErrorResultCode(),
                     message);
            get(entry.getName(), completeFilter, filterType);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
    }
    else if (filterComponents.isEmpty())
    {
@@ -2393,18 +2386,14 @@
      if (depth >= MAX_NESTED_FILTER_DEPTH)
      {
        LocalizableMessage message = ERR_SEARCH_FILTER_NESTED_TOO_DEEP.
            get(String.valueOf(entry.getName()),
                String.valueOf(completeFilter));
        throw new DirectoryException(
                       DirectoryServer.getServerErrorResultCode(),
                       message);
            get(entry.getName(), completeFilter);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
      }

      for (SearchFilter f : filterComponents)
      {
        ConditionResult result =
             f.matchesEntryInternal(completeFilter, entry,
                                 depth+1);
             f.matchesEntryInternal(completeFilter, entry, depth + 1);
        switch (result)
        {
          case TRUE:
@@ -2429,13 +2418,8 @@
          default:
            LocalizableMessage message =
                ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
                  get(String.valueOf(entry.getName()),
                      String.valueOf(completeFilter),
                      String.valueOf(result));
            throw new
                 DirectoryException(
                      DirectoryServer.getServerErrorResultCode(),
                      message);
                  get(entry.getName(), completeFilter, result);
            throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), message);
        }
      }

@@ -2482,9 +2466,7 @@
      // The set of subcomponents was null.  This is not allowed.
      LocalizableMessage message =
          ERR_SEARCH_FILTER_COMPOUND_COMPONENTS_NULL.
            get(String.valueOf(entry.getName()),
                String.valueOf(completeFilter),
                String.valueOf(filterType));
            get(entry.getName(), completeFilter, filterType);
      throw new DirectoryException(
                     DirectoryServer.getServerErrorResultCode(),
                     message);
@@ -2510,8 +2492,7 @@
      if (depth >= MAX_NESTED_FILTER_DEPTH)
      {
        LocalizableMessage message = ERR_SEARCH_FILTER_NESTED_TOO_DEEP.
            get(String.valueOf(entry.getName()),
                String.valueOf(completeFilter));
            get(entry.getName(), completeFilter);
        throw new DirectoryException(
                       DirectoryServer.getServerErrorResultCode(),
                       message);
@@ -2547,9 +2528,7 @@
          default:
            LocalizableMessage message =
                ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
                  get(String.valueOf(entry.getName()),
                      String.valueOf(completeFilter),
                      String.valueOf(result));
                  get(entry.getName(), completeFilter, result);
            throw new
                 DirectoryException(
                      DirectoryServer.getServerErrorResultCode(),
@@ -2599,8 +2578,7 @@
    {
      // The NOT subcomponent was null.  This is not allowed.
      LocalizableMessage message = ERR_SEARCH_FILTER_NOT_COMPONENT_NULL.
          get(String.valueOf(entry.getName()),
              String.valueOf(completeFilter));
          get(entry.getName(), completeFilter);
      throw new DirectoryException(
                     DirectoryServer.getServerErrorResultCode(),
                     message);
@@ -2613,8 +2591,7 @@
      if (depth >= MAX_NESTED_FILTER_DEPTH)
      {
        LocalizableMessage message = ERR_SEARCH_FILTER_NESTED_TOO_DEEP.
            get(String.valueOf(entry.getName()),
                String.valueOf(completeFilter));
            get(entry.getName(), completeFilter);
        throw new DirectoryException(
                       DirectoryServer.getServerErrorResultCode(),
                       message);
@@ -2654,9 +2631,7 @@
          return ConditionResult.UNDEFINED;
        default:
          LocalizableMessage message = ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
              get(String.valueOf(entry.getName()),
                  String.valueOf(completeFilter),
                  String.valueOf(result));
              get(entry.getName(), completeFilter, result);
          throw new
               DirectoryException(
                    DirectoryServer.getServerErrorResultCode(),
@@ -2692,9 +2667,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_EQUALITY_NO_ATTRIBUTE_TYPE.
            get(String.valueOf(entry.getName()), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // Make sure that an assertion value has been defined.
@@ -2702,10 +2676,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_EQUALITY_NO_ASSERTION_VALUE.
            get(String.valueOf(entry.getName()), toString(),
                attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString(), attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // See if the entry has an attribute with the requested type.
@@ -2816,9 +2788,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_SUBSTRING_NO_ATTRIBUTE_TYPE.
            get(String.valueOf(entry.getName()), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // Make sure that at least one substring element has been
@@ -2829,10 +2800,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_SUBSTRING_NO_SUBSTRING_COMPONENTS.
            get(String.valueOf(entry.getName()), toString(),
                attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString(), attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // See if the entry has an attribute with the requested type.
@@ -2924,9 +2893,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_GREATER_OR_EQUAL_NO_ATTRIBUTE_TYPE.
            get(String.valueOf(entry.getName()), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // Make sure that an assertion value has been defined.
@@ -2934,10 +2902,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_GREATER_OR_EQUAL_NO_VALUE.
            get(String.valueOf(entry.getName()), toString(),
                attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString(), attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // See if the entry has an attribute with the requested type.
@@ -3027,9 +2993,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_LESS_OR_EQUAL_NO_ATTRIBUTE_TYPE.
            get(String.valueOf(entry.getName()), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // Make sure that an assertion value has been defined.
@@ -3037,10 +3002,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_LESS_OR_EQUAL_NO_ASSERTION_VALUE.
            get(String.valueOf(entry.getName()), toString(),
                attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString(), attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // See if the entry has an attribute with the requested type.
@@ -3129,9 +3092,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_PRESENCE_NO_ATTRIBUTE_TYPE.
            get(String.valueOf(entry.getName()), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }


@@ -3189,9 +3151,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_APPROXIMATE_NO_ATTRIBUTE_TYPE.
            get(String.valueOf(entry.getName()), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // Make sure that an assertion value has been defined.
@@ -3199,10 +3160,8 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_APPROXIMATE_NO_ASSERTION_VALUE.
            get(String.valueOf(entry.getName()), toString(),
                attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
            get(entry.getName(), toString(), attributeType.getNameOrOID());
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message);
    }

    // See if the entry has an attribute with the requested type.
@@ -3295,8 +3254,7 @@
    {
      LocalizableMessage message =
          ERR_SEARCH_FILTER_EXTENSIBLE_MATCH_NO_ASSERTION_VALUE.
            get(String.valueOf(entry.getName()),
                String.valueOf(completeFilter));
            get(entry.getName(), completeFilter);
      throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                   message);
    }
@@ -3327,8 +3285,7 @@
      {
        LocalizableMessage message =
            ERR_SEARCH_FILTER_EXTENSIBLE_MATCH_NO_RULE_OR_TYPE.
              get(String.valueOf(entry.getName()),
                  String.valueOf(completeFilter));
              get(entry.getName(), completeFilter);
        throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                     message);
      }
@@ -3424,9 +3381,7 @@
                default:
                  LocalizableMessage message =
                      ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
                        get(String.valueOf(entry.getName()),
                            String.valueOf(completeFilter),
                            String.valueOf(r));
                        get(entry.getName(), completeFilter, r);
                  throw new DirectoryException(
                                 ResultCode.PROTOCOL_ERROR, message);
              }
@@ -3469,9 +3424,7 @@
                default:
                  LocalizableMessage message =
                      ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
                        get(String.valueOf(entry.getName()),
                            String.valueOf(completeFilter),
                            String.valueOf(r));
                        get(entry.getName(), completeFilter, r);
                  throw new DirectoryException(
                                 ResultCode.PROTOCOL_ERROR, message);
              }
@@ -3508,9 +3461,7 @@
              break;
            default:
              LocalizableMessage message = ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
                  get(String.valueOf(entry.getName()),
                      String.valueOf(completeFilter),
                      String.valueOf(r));
                  get(entry.getName(), completeFilter, r);
              throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                           message);
          }
@@ -3553,9 +3504,7 @@
                default:
                  LocalizableMessage message =
                      ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
                        get(String.valueOf(entry.getName()),
                            String.valueOf(completeFilter),
                            String.valueOf(r));
                        get(entry.getName(), completeFilter, r);
                  throw new DirectoryException(
                                 ResultCode.PROTOCOL_ERROR, message);
              }
@@ -3611,9 +3560,7 @@
                default:
                  LocalizableMessage message =
                      ERR_SEARCH_FILTER_INVALID_RESULT_TYPE.
                        get(String.valueOf(entry.getName()),
                            String.valueOf(completeFilter),
                            String.valueOf(r));
                        get(entry.getName(), completeFilter, r);
                  throw new DirectoryException(
                                 ResultCode.PROTOCOL_ERROR, message);
              }

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

@@ -395,8 +395,7 @@
      {
        logger.traceException(me);

        LocalizableMessage msg = ERR_EMAILMSG_INVALID_SENDER_ADDRESS.get(
            String.valueOf(sender), me.getMessage());
        LocalizableMessage msg = ERR_EMAILMSG_INVALID_SENDER_ADDRESS.get(sender, me.getMessage());
        throw new MessagingException(msg.toString(), me);
      }

@@ -417,8 +416,7 @@
        {
          logger.traceException(me);

          LocalizableMessage msg = ERR_EMAILMSG_INVALID_RECIPIENT_ADDRESS.get(
              String.valueOf(recipient), me.getMessage());
          LocalizableMessage msg = ERR_EMAILMSG_INVALID_RECIPIENT_ADDRESS.get(recipient, me.getMessage());
          throw new MessagingException(msg.toString(), me);
        }
      }

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

@@ -273,8 +273,7 @@
                    "exclude branches.", entryDN);
          }
          entriesRead.incrementAndGet();
          LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
          logToSkipWriter(lines, message);
          logToSkipWriter(lines, ERR_LDIF_SKIP.get(entryDN));
          continue;
        }
        entryID = rootContainer.getNextEntryID();
@@ -288,8 +287,7 @@
                    "check." ,entryDN);
          }
          entriesRead.incrementAndGet();
          LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
          logToSkipWriter(lines, message);
          logToSkipWriter(lines, ERR_LDIF_SKIP.get(entryDN));
          continue;
        }
        entriesRead.incrementAndGet();
@@ -317,9 +315,7 @@
          logger.trace("Skipping entry %s because reading" +
                  "its attributes failed.", entryDN);
        }
        LocalizableMessage message = ERR_LDIF_READ_ATTR_SKIP.get(String.valueOf(entryDN),
                                                       e.getMessage());
        logToSkipWriter(lines, message);
        logToSkipWriter(lines, ERR_LDIF_READ_ATTR_SKIP.get(entryDN, e.getMessage()));
        suffix.removePending(entryDN);
        continue;
      }
@@ -344,8 +340,7 @@
                "that should be included based on the include and exclude " +
                "filters.", entryDN);
          }
          LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
          logToSkipWriter(lines, message);
          logToSkipWriter(lines, ERR_LDIF_SKIP.get(entryDN));
          suffix.removePending(entryDN);
          continue;
        }
@@ -354,10 +349,8 @@
      {
        logger.traceException(e);
        suffix.removePending(entryDN);
        LocalizableMessage message = ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT.
            get(String.valueOf(entry.getName()), lastEntryLineNumber,
                String.valueOf(e));
        logToSkipWriter(lines, message);
        logToSkipWriter(lines,
            ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT.get(entry.getName(), lastEntryLineNumber, e));
        suffix.removePending(entryDN);
        continue;
      }
@@ -374,13 +367,11 @@
          LocalizableMessage rejectMessage = pluginResult.getErrorMessage();
          if (rejectMessage == null)
          {
            m = ERR_LDIF_REJECTED_BY_PLUGIN_NOMESSAGE.get(
                     String.valueOf(entryDN));
            m = ERR_LDIF_REJECTED_BY_PLUGIN_NOMESSAGE.get(entryDN);
          }
          else
          {
            m = ERR_LDIF_REJECTED_BY_PLUGIN.get(String.valueOf(entryDN),
                                                rejectMessage);
            m = ERR_LDIF_REJECTED_BY_PLUGIN.get(entryDN, rejectMessage);
          }

          logToRejectWriter(lines, m);
@@ -496,8 +487,7 @@
                    entryDN);
        }
        entriesRead.incrementAndGet();
        LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
        logToSkipWriter(lines, message);
        logToSkipWriter(lines, ERR_LDIF_SKIP.get(entryDN));
        continue;
      }
      else
@@ -538,8 +528,7 @@
                "that should be included based on the include and exclude " +
                "filters.", entryDN);
          }
          LocalizableMessage message = ERR_LDIF_SKIP.get(String.valueOf(entryDN));
          logToSkipWriter(lines, message);
          logToSkipWriter(lines, ERR_LDIF_SKIP.get(entryDN));
          continue;
        }
      }
@@ -548,8 +537,7 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_LDIF_COULD_NOT_EVALUATE_FILTERS_FOR_IMPORT.
            get(String.valueOf(entry.getName()), lastEntryLineNumber,
                String.valueOf(e));
            get(entry.getName(), lastEntryLineNumber, e);
        throw new LDIFException(message, lastEntryLineNumber, true, e);
      }

@@ -565,13 +553,11 @@
          LocalizableMessage rejectMessage = pluginResult.getErrorMessage();
          if (rejectMessage == null)
          {
            m = ERR_LDIF_REJECTED_BY_PLUGIN_NOMESSAGE.get(
                     String.valueOf(entryDN));
            m = ERR_LDIF_REJECTED_BY_PLUGIN_NOMESSAGE.get(entryDN);
          }
          else
          {
            m = ERR_LDIF_REJECTED_BY_PLUGIN.get(String.valueOf(entryDN),
                                                rejectMessage);
            m = ERR_LDIF_REJECTED_BY_PLUGIN.get(entryDN, rejectMessage);
          }

          logToRejectWriter(lines, m);
@@ -1068,7 +1054,8 @@

      if (objectClasses.containsKey(objectClass))
      {
        logger.warn(WARN_LDIF_DUPLICATE_OBJECTCLASS.get(String.valueOf(entryDN), lastEntryLineNumber, ocName));
        logger.warn(WARN_LDIF_DUPLICATE_OBJECTCLASS.get(
            entryDN, lastEntryLineNumber, ocName));
      }
      else
      {
@@ -1100,7 +1087,7 @@
       if(attribute.hasOption("binary"))
        {
          LocalizableMessage message = ERR_LDIF_INVALID_ATTR_OPTION.get(
            String.valueOf(entryDN),lastEntryLineNumber, attrName);
            entryDN, lastEntryLineNumber, attrName);
          logToRejectWriter(lines, message);
          throw new LDIFException(message, lastEntryLineNumber,true);
        }
@@ -1164,8 +1151,7 @@
          if (attrType.isSingleValue() && (a.size() > 1)  && checkSchema)
          {
            LocalizableMessage message = ERR_LDIF_MULTIPLE_VALUES_FOR_SINGLE_VALUED_ATTR
                    .get(String.valueOf(entryDN),
                            lastEntryLineNumber, attrName);
                    .get(entryDN, lastEntryLineNumber, attrName);
            logToRejectWriter(lines, message);
            throw new LDIFException(message, lastEntryLineNumber, true);
          }
@@ -1790,9 +1776,7 @@
          logger.traceException(e);

          LocalizableMessage message = ERR_LDIF_COULD_NOT_BASE64_DECODE_ATTR.get(
                  String.valueOf(entryDN),
                  lastEntryLineNumber, line,
                  String.valueOf(e));
              entryDN, lastEntryLineNumber, line, e);
          logToRejectWriter(lines, message);
          throw new LDIFException(message, lastEntryLineNumber, true, e);
        }
@@ -1813,10 +1797,8 @@
          // The URL was malformed or had an invalid protocol.
          logger.traceException(e);

          LocalizableMessage message = ERR_LDIF_INVALID_URL.get(String.valueOf(entryDN),
                                      lastEntryLineNumber,
                                      String.valueOf(attrName),
                                      String.valueOf(e));
          LocalizableMessage message = ERR_LDIF_INVALID_URL.get(
              entryDN, lastEntryLineNumber, attrName, e);
          logToRejectWriter(lines, message);
          throw new LDIFException(message, lastEntryLineNumber, true, e);
        }
@@ -1837,11 +1819,8 @@
          // We were unable to read the contents of that URL for some reason.
          logger.traceException(e);

          LocalizableMessage message = ERR_LDIF_URL_IO_ERROR.get(String.valueOf(entryDN),
                                      lastEntryLineNumber,
                                      String.valueOf(attrName),
                                      String.valueOf(contentURL),
                                      String.valueOf(e));
          LocalizableMessage message = ERR_LDIF_URL_IO_ERROR.get(
              entryDN, lastEntryLineNumber, attrName, contentURL, e);
          logToRejectWriter(lines, message);
          throw new LDIFException(message, lastEntryLineNumber, true, e);
        }

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

@@ -2420,8 +2420,7 @@
    // throw an exception.
    if (! mayUseExec())
    {
      LocalizableMessage message = ERR_EXEC_DISABLED.get(String.valueOf(command));
      throw new SecurityException(message.toString());
      throw new SecurityException(ERR_EXEC_DISABLED.get(command).toString());
    }



 opendj3-server-dev/src/server/org/opends/server/util/args/ArgumentParser.java

@@ -613,10 +613,8 @@
    if (shortID != null && shortIDMap.containsKey(shortID))
    {
      String conflictingName = shortIDMap.get(shortID).getName();

      LocalizableMessage message = ERR_ARGPARSER_DUPLICATE_SHORT_ID.get(
          argument.getName(), String.valueOf(shortID), conflictingName);
      throw new ArgumentException(message);
      throw new ArgumentException(ERR_ARGPARSER_DUPLICATE_SHORT_ID.get(
          argument.getName(), shortID, conflictingName));
    }

    if (versionArgument != null
@@ -984,9 +982,8 @@
          else
          {
            // There is no such argument registered.
            LocalizableMessage message = ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID.get(
                String.valueOf(argCharacter));
            throw new ArgumentException(message);
            throw new ArgumentException(
                ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID.get(argCharacter));
          }
        }
        else
@@ -1011,10 +1008,8 @@
          {
            if ((i+1) == numArguments)
            {
              LocalizableMessage message =
                  ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID.
                    get(String.valueOf(argCharacter));
              throw new ArgumentException(message);
              throw new ArgumentException(
                  ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID.get(argCharacter));
            }

            argValue = rawArguments[++i];
@@ -1053,17 +1048,15 @@
              if (b == null)
              {
                // There is no such argument registered.
                LocalizableMessage message = ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID.get(
                    String.valueOf(argCharacter));
                throw new ArgumentException(message);
                throw new ArgumentException(
                    ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID.get(argCharacter));
              }
              else if (b.needsValue())
              {
                // This means we're in a scenario like "-abc" where b is a
                // valid argument that takes a value.  We don't support that.
                LocalizableMessage message = ERR_ARGPARSER_CANT_MIX_ARGS_WITH_VALUES.get(
                    String.valueOf(argCharacter), argValue, String.valueOf(c));
                throw new ArgumentException(message);
                throw new ArgumentException(
                    ERR_ARGPARSER_CANT_MIX_ARGS_WITH_VALUES.get(argCharacter, argValue, c));
              }
              else
              {
@@ -1283,8 +1276,8 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE.get(String
          .valueOf(propertiesFilePath), getExceptionMessage(e));
      LocalizableMessage message = ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE.get(
          propertiesFilePath, getExceptionMessage(e));
      throw new ArgumentException(message, e);
    }
    return argumentProperties;

 opendj3-server-dev/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java

@@ -376,8 +376,7 @@
    } catch (OpenDsException e) {
      if ((e.getCause() != null) && (e.getCause().getCause() != null) &&
        e.getCause().getCause() instanceof SSLException) {
        err.println(ERR_TASKINFO_LDAP_EXCEPTION_SSL.get(ui.getHostName(),
          String.valueOf(ui.getPortNumber())));
        err.println(ERR_TASKINFO_LDAP_EXCEPTION_SSL.get(ui.getHostName(), ui.getPortNumber()));
      } else {
        err.println(e.getMessageObject());
      }

 opendj3-server-dev/src/server/org/opends/server/util/args/SubCommand.java

@@ -300,18 +300,15 @@
    {
      if (shortIDMap.containsKey(shortID))
      {
        LocalizableMessage message = ERR_ARG_SUBCOMMAND_DUPLICATE_SHORT_ID.
            get(argumentName, name, String.valueOf(shortID),
                shortIDMap.get(shortID).getName());
        throw new ArgumentException(message);
        throw new ArgumentException(ERR_ARG_SUBCOMMAND_DUPLICATE_SHORT_ID.get(
            argumentName, name, shortID, shortIDMap.get(shortID).getName()));
      }

      Argument arg = parser.getGlobalArgumentForShortID(shortID);
      if (arg != null)
      {
        LocalizableMessage message = ERR_ARG_SUBCOMMAND_ARGUMENT_SHORT_ID_GLOBAL_CONFLICT.
            get(argumentName, name, String.valueOf(shortID), arg.getName());
        throw new ArgumentException(message);
        throw new ArgumentException(ERR_ARG_SUBCOMMAND_ARGUMENT_SHORT_ID_GLOBAL_CONFLICT.get(
            argumentName, name, shortID, arg.getName()));
      }
    }


 opendj3-server-dev/src/server/org/opends/server/util/args/SubCommandArgumentParser.java

@@ -484,10 +484,8 @@
      if (globalShortIDMap.containsKey(shortID))
      {
        String name = globalShortIDMap.get(shortID).getName();

        LocalizableMessage message = ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_SHORT_ID.get(
            String.valueOf(shortID), argumentName, name);
        throw new ArgumentException(message);
        throw new ArgumentException(
            ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_SHORT_ID.get(shortID, argumentName, name));
      }

      for (SubCommand s : subCommands.values())
@@ -497,9 +495,8 @@
          String cmdName = s.getName();
          String name    = s.getArgument(shortID).getName();

          LocalizableMessage message = ERR_SUBCMDPARSER_GLOBAL_ARG_SHORT_ID_CONFLICT.get(
              String.valueOf(shortID), argumentName, name, cmdName);
          throw new ArgumentException(message);
          throw new ArgumentException(
              ERR_SUBCMDPARSER_GLOBAL_ARG_SHORT_ID_CONFLICT.get(shortID, argumentName, name, cmdName));
        }
      }
    }
@@ -937,21 +934,17 @@
              }
              else
              {
                // -V is defined in another suncommand, so we can
                // -V is defined in another subcommand, so we can
                // accepted it as the version information argument
                LocalizableMessage message =
                    ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_SHORT_ID.
                      get(String.valueOf(argCharacter));
                throw new ArgumentException(message);
                throw new ArgumentException(
                    ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_SHORT_ID.get(argCharacter));
              }
            }
            else
            {
              // There is no such argument registered.
              LocalizableMessage message =
                  ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_SHORT_ID.
                    get(String.valueOf(argCharacter));
              throw new ArgumentException(message);
              throw new ArgumentException(
                  ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_SHORT_ID.get(argCharacter));
            }
          }
          else
@@ -979,9 +972,8 @@
              else
              {
                // There is no such argument registered.
                LocalizableMessage message = ERR_SUBCMDPARSER_NO_ARGUMENT_FOR_SHORT_ID.get(
                    String.valueOf(argCharacter));
                throw new ArgumentException(message);
                throw new ArgumentException(
                    ERR_SUBCMDPARSER_NO_ARGUMENT_FOR_SHORT_ID.get(argCharacter));
              }
            }
          }
@@ -1005,10 +997,8 @@
          {
            if ((i+1) == numArguments)
            {
              LocalizableMessage message =
                  ERR_SUBCMDPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID.
                    get(String.valueOf(argCharacter));
              throw new ArgumentException(message);
              throw new ArgumentException(
                  ERR_SUBCMDPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID.get(argCharacter));
            }

            argValue = rawArguments[++i];
@@ -1048,19 +1038,16 @@
              {
                if (subCommand == null)
                {
                  LocalizableMessage message =
                      ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_SHORT_ID.
                        get(String.valueOf(argCharacter));
                  throw new ArgumentException(message);
                  throw new ArgumentException(
                      ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_SHORT_ID.get(argCharacter));
                }
                else
                {
                  b = subCommand.getArgument(c);
                  if (b == null)
                  {
                    LocalizableMessage message = ERR_SUBCMDPARSER_NO_ARGUMENT_FOR_SHORT_ID.
                        get(String.valueOf(argCharacter));
                    throw new ArgumentException(message);
                    throw new ArgumentException(
                        ERR_SUBCMDPARSER_NO_ARGUMENT_FOR_SHORT_ID.get(argCharacter));
                  }
                }
              }
@@ -1069,10 +1056,8 @@
              {
                // This means we're in a scenario like "-abc" where b is a
                // valid argument that takes a value.  We don't support that.
                LocalizableMessage message = ERR_SUBCMDPARSER_CANT_MIX_ARGS_WITH_VALUES.
                    get(String.valueOf(argCharacter), argValue,
                        String.valueOf(c));
                throw new ArgumentException(message);
                throw new ArgumentException(
                    ERR_SUBCMDPARSER_CANT_MIX_ARGS_WITH_VALUES.get(argCharacter, argValue, c));
              }
              else
              {

 opendj3-server-dev/src/server/org/opends/server/util/cli/ConsoleApplication.java

@@ -1190,8 +1190,7 @@
                  || (e.getCause() instanceof SSLHandshakeException))
              {
                LocalizableMessage message =
                    ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED.get(
                        hostName, String.valueOf(portNumber));
                    ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_NOT_TRUSTED.get(hostName, portNumber);
                throw new ClientException(
                    LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
              }
@@ -1199,8 +1198,7 @@
            if (e.getCause() instanceof SSLException)
            {
              LocalizableMessage message =
                  ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(
                      hostName, String.valueOf(portNumber));
                  ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT_WRONG_PORT.get(hostName, portNumber);
              throw new ClientException(
                  LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
            }
@@ -1259,15 +1257,13 @@
            else
            {
              LocalizableMessage message =
                  ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, String
                      .valueOf(portNumber));
                  ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, portNumber);
              throw new ClientException(
                  LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR, message);
            }
          }
          LocalizableMessage message =
              ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, String
                  .valueOf(portNumber));
              ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, portNumber);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR,
              message);
        }
@@ -1289,8 +1285,7 @@
        catch (NamingException e)
        {
          LocalizableMessage message =
              ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, String
                  .valueOf(portNumber));
              ERR_DSCFG_ERROR_LDAP_FAILED_TO_CONNECT.get(hostName, portNumber);
          throw new ClientException(LDAPResultCode.CLIENT_SIDE_CONNECT_ERROR,
              message);
        }

 opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java

@@ -1819,22 +1819,21 @@

     UserDataCertificateException udce =
       new UserDataCertificateException(Step.REPLICATION_OPTIONS,
           INFO_CERTIFICATE_EXCEPTION.get(h, String.valueOf(p)), t, h, p,
           INFO_CERTIFICATE_EXCEPTION.get(h, p), t, h, p,
               usedTrustManager.getLastRefusedChain(),
               usedTrustManager.getLastRefusedAuthType(), excType);

     LocalizableMessage msg;
     if (udce.getType() == UserDataCertificateException.Type.NOT_TRUSTED)
     {
       msg = INFO_CERTIFICATE_NOT_TRUSTED_TEXT_CLI.get(
           udce.getHost(), String.valueOf(udce.getPort()));
       msg = INFO_CERTIFICATE_NOT_TRUSTED_TEXT_CLI.get(udce.getHost(), udce.getPort());
     }
     else
     {
       msg = INFO_CERTIFICATE_NAME_MISMATCH_TEXT_CLI.get(
           udce.getHost(), String.valueOf(udce.getPort()),
           udce.getHost(), udce.getPort(),
           udce.getHost(),
           udce.getHost(), String.valueOf(udce.getPort()));
           udce.getHost(), udce.getPort());
     }
     if (displayErrorMessage)
     {

 opendj3-server-dev/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java

@@ -475,11 +475,9 @@
        t = e.getCause();
      }

      LocalizableMessage message =
        ERR_CONFIG_WORKFLOW_ELEMENT_CANNOT_INITIALIZE.get(
            className, String.valueOf(configuration.dn()),
            t.getMessage());
      throw new InitializationException(message);
      throw new InitializationException(
          ERR_CONFIG_WORKFLOW_ELEMENT_CANNOT_INITIALIZE.get(
              className, configuration.dn(), t.getMessage()));
    }
  }


 opendj3-server-dev/src/server/org/opends/server/workflowelement/externalchangelog/ECLSearchOperation.java

@@ -229,8 +229,7 @@
      if (replicationServer == null)
      {
        setResultCode(ResultCode.OPERATIONS_ERROR);
        appendErrorMessage(ERR_SEARCH_BASE_DOESNT_EXIST.get(
            String.valueOf(baseDN)));
        appendErrorMessage(ERR_SEARCH_BASE_DOESNT_EXIST.get(baseDN));
        break searchProcessing;
      }


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

@@ -268,8 +268,7 @@
      if (entryLock == null)
      {
        setResultCode(ResultCode.BUSY);
        appendErrorMessage(ERR_ADD_CANNOT_LOCK_ENTRY.get(
            String.valueOf(entryDN)));
        appendErrorMessage(ERR_ADD_CANNOT_LOCK_ENTRY.get(entryDN));
        return;
      }

@@ -333,7 +332,7 @@
      {
        setResultCodeAndMessageNoInfoDisclosure(entryDN,
            ResultCode.ENTRY_ALREADY_EXISTS,
            ERR_ADD_ENTRY_ALREADY_EXISTS.get(String.valueOf(entryDN)));
            ERR_ADD_ENTRY_ALREADY_EXISTS.get(entryDN));
        return;
      }

@@ -353,15 +352,13 @@
          {
            // check whether matchedDN allows to disclose info
            setResultCodeAndMessageNoInfoDisclosure(matchedDN,
                ResultCode.NO_SUCH_OBJECT, ERR_ADD_NO_PARENT.get(String
                    .valueOf(entryDN), String.valueOf(parentDN)));
                ResultCode.NO_SUCH_OBJECT, ERR_ADD_NO_PARENT.get(entryDN, parentDN));
          }
          else
          {
            // no matched DN either, so let's return normal error code
            setResultCode(ResultCode.NO_SUCH_OBJECT);
            appendErrorMessage(ERR_ADD_NO_PARENT.get(String.valueOf(entryDN),
                String.valueOf(parentDN)));
            appendErrorMessage(ERR_ADD_NO_PARENT.get(entryDN, parentDN));
          }
          return;
        }
@@ -441,8 +438,7 @@
        {
          setResultCodeAndMessageNoInfoDisclosure(entryDN,
              ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
              ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(
                  String.valueOf(entryDN)));
              ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(entryDN));
          return;
        }
      }
@@ -590,8 +586,7 @@
        {
          setResultCodeAndMessageNoInfoDisclosure(entryDN,
              ResultCode.CONSTRAINT_VIOLATION,
              ERR_ADD_ATTR_IS_NO_USER_MOD.get(
                  String.valueOf(entryDN), at.getNameOrOID()));
              ERR_ADD_ATTR_IS_NO_USER_MOD.get(entryDN, at.getNameOrOID()));
          return true;
        }
      }
@@ -604,7 +599,7 @@
  {
    return LocalBackendWorkflowElement.newDirectoryException(this, null,
        entryDN, resultCode, message, ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
        ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(String.valueOf(entryDN)));
        ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(entryDN));
  }

  private void setResultCodeAndMessageNoInfoDisclosure(DN entryDN,
@@ -613,7 +608,7 @@
    LocalBackendWorkflowElement.setResultCodeAndMessageNoInfoDisclosure(this,
        null, entryDN, resultCode, message,
        ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
        ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(String.valueOf(entryDN)));
        ERR_ADD_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(entryDN));
  }

  /**
@@ -632,9 +627,7 @@
      if (parentLock == null)
      {
        throw newDirectoryException(parentDN, ResultCode.BUSY,
            ERR_ADD_CANNOT_LOCK_PARENT.get(
                String.valueOf(entryDN),
                String.valueOf(parentDN)));
            ERR_ADD_CANNOT_LOCK_PARENT.get(entryDN, parentDN));
      }
      return parentLock;
    }
@@ -656,7 +649,7 @@
      // The entry doesn't have a parent but isn't a suffix.  This is not
      // allowed.
      throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
          ERR_ADD_ENTRY_NOT_SUFFIX.get(String.valueOf(entryDN)));
          ERR_ADD_ENTRY_NOT_SUFFIX.get(entryDN));
    }
  }

@@ -708,8 +701,7 @@
      else
      {
        throw newDirectoryException(entryDN, ResultCode.CONSTRAINT_VIOLATION,
                                     ERR_ADD_MISSING_RDN_ATTRIBUTE.get(
                                          String.valueOf(entryDN), n));
            ERR_ADD_MISSING_RDN_ATTRIBUTE.get(entryDN, n));
      }
    }
    else
@@ -744,8 +736,7 @@
        else
        {
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                       ERR_ADD_MISSING_RDN_ATTRIBUTE.get(
                                            String.valueOf(entryDN), n));
              ERR_ADD_MISSING_RDN_ATTRIBUTE.get(entryDN, n));
        }
      }
    }
@@ -920,11 +911,8 @@
            addPWPolicyControl(
                 PasswordPolicyErrorType.INSUFFICIENT_PASSWORD_QUALITY);

            LocalizableMessage message = ERR_PWPOLICY_VALIDATION_FAILED.
                get(passwordAttribute.getNameOrOID(),
                    String.valueOf(invalidReason));
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                         message);
                ERR_PWPOLICY_VALIDATION_FAILED.get(passwordAttribute.getNameOrOID(), invalidReason));
          }
        }
      }
@@ -1028,9 +1016,7 @@
      if (at.isObsolete())
      {
        throw newDirectoryException(entryDN, ResultCode.CONSTRAINT_VIOLATION,
                                     WARN_ADD_ATTR_IS_OBSOLETE.get(
                                          String.valueOf(entryDN),
                                          at.getNameOrOID()));
            WARN_ADD_ATTR_IS_OBSOLETE.get(entryDN, at.getNameOrOID()));
      }
    }

@@ -1039,9 +1025,7 @@
      if (at.isObsolete())
      {
        throw newDirectoryException(entryDN, ResultCode.CONSTRAINT_VIOLATION,
                                     WARN_ADD_ATTR_IS_OBSOLETE.get(
                                          String.valueOf(entryDN),
                                          at.getNameOrOID()));
            WARN_ADD_ATTR_IS_OBSOLETE.get(entryDN, at.getNameOrOID()));
      }
    }

@@ -1050,9 +1034,7 @@
      if (oc.isObsolete())
      {
        throw newDirectoryException(entryDN, ResultCode.CONSTRAINT_VIOLATION,
                                     WARN_ADD_OC_IS_OBSOLETE.get(
                                          String.valueOf(entryDN),
                                          oc.getNameOrOID()));
            WARN_ADD_OC_IS_OBSOLETE.get(entryDN, oc.getNameOrOID()));
      }
    }
  }
@@ -1077,18 +1059,12 @@
              {
                // Value is not human-readable
                message = WARN_ADD_OP_INVALID_SYNTAX_NO_VALUE.
                    get(String.valueOf(entryDN),
                        String.valueOf(a.getName()),
                        String.valueOf(invalidReason));
                    get(entryDN, a.getName(), invalidReason);
              }
              else
              {
                message = WARN_ADD_OP_INVALID_SYNTAX.
                    get(String.valueOf(entryDN),
                        String.valueOf(v.getValue()),
                        String.valueOf(a.getName()),
                        String.valueOf(invalidReason));

                    get(entryDN, v.getValue(), a.getName(), invalidReason);
              }

              switch (DirectoryServer.getSyntaxEnforcementPolicy())
@@ -1145,8 +1121,7 @@

            throw newDirectoryException(entryDN, de.getResultCode(),
                ERR_ADD_CANNOT_PROCESS_ASSERTION_FILTER.get(
                    String.valueOf(entryDN),
                    de.getMessageObject()));
                    entryDN, de.getMessageObject()));
          }

          // Check if the current user has permission to make
@@ -1164,8 +1139,7 @@
            if (!filter.matchesEntry(entry))
            {
              throw newDirectoryException(entryDN, ResultCode.ASSERTION_FAILED,
                  ERR_ADD_ASSERTION_FAILED.get(String
                      .valueOf(entryDN)));
                  ERR_ADD_ASSERTION_FAILED.get(entryDN));
            }
          }
          catch (DirectoryException de)
@@ -1179,8 +1153,7 @@

            throw newDirectoryException(entryDN, de.getResultCode(),
                ERR_ADD_CANNOT_PROCESS_ASSERTION_FILTER.get(
                    String.valueOf(entryDN),
                    de.getMessageObject()));
                    entryDN, de.getMessageObject()));
          }
        }
        else if (oid.equals(OID_LDAP_NOOP_OPENLDAP_ASSIGNED))
@@ -1258,12 +1231,10 @@
          {
            throw newDirectoryException(entryDN,
                           ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
                           ERR_ADD_UNSUPPORTED_CRITICAL_CONTROL.get(
                                String.valueOf(entryDN), oid));
                           ERR_ADD_UNSUPPORTED_CRITICAL_CONTROL.get(entryDN, oid));
          }
        }
      }
    }
  }
}


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

@@ -443,8 +443,7 @@
    if (userLock == null)
    {
      throw new DirectoryException(ResultCode.BUSY,
                                   ERR_BIND_OPERATION_CANNOT_LOCK_USER.get(
                                        String.valueOf(bindDN)));
          ERR_BIND_OPERATION_CANNOT_LOCK_USER.get(bindDN));
    }

    try
@@ -901,8 +900,7 @@
      if (! DirectoryServer.isRootDN(userEntry.getName()))
      {
        throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
                       ERR_BIND_OPERATION_WRITABILITY_DISABLED.get(
                            String.valueOf(userEntry.getName())));
            ERR_BIND_OPERATION_WRITABILITY_DISABLED.get(userEntry.getName()));
      }
    }

@@ -917,9 +915,7 @@
        if (! saslHandler.isSecure(saslMechanism))
        {
          throw new DirectoryException(ResultCode.INVALID_CREDENTIALS,
                         ERR_BIND_OPERATION_INSECURE_SASL_BIND.get(
                              saslMechanism,
                              String.valueOf(userEntry.getName())));
              ERR_BIND_OPERATION_INSECURE_SASL_BIND.get(saslMechanism, userEntry.getName()));
        }
      }
      else

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

@@ -191,8 +191,7 @@
      if (readLock == null)
      {
        setResultCode(ResultCode.BUSY);
        appendErrorMessage(ERR_COMPARE_CANNOT_LOCK_ENTRY.get(
            String.valueOf(entryDN)));
        appendErrorMessage(ERR_COMPARE_CANNOT_LOCK_ENTRY.get(entryDN));
        return;
      }

@@ -203,8 +202,7 @@
        if (entry == null)
        {
          setResultCode(ResultCode.NO_SUCH_OBJECT);
          appendErrorMessage(ERR_COMPARE_NO_SUCH_ENTRY.get(String
              .valueOf(entryDN)));
          appendErrorMessage(ERR_COMPARE_NO_SUCH_ENTRY.get(entryDN));

          // See if one of the entry's ancestors exists.
          setMatchedDN(findMatchedDN(entryDN));
@@ -241,8 +239,7 @@
        {
          setResultCodeAndMessageNoInfoDisclosure(entry, entryDN,
              ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
              ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(String
                  .valueOf(entryDN)));
              ERR_COMPARE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(entryDN));
          return;
        }
      }
@@ -284,13 +281,11 @@
        setResultCode(ResultCode.NO_SUCH_ATTRIBUTE);
        if (options == null)
        {
          appendErrorMessage(WARN_COMPARE_OP_NO_SUCH_ATTR.get(String
              .valueOf(entryDN), getRawAttributeType()));
          appendErrorMessage(WARN_COMPARE_OP_NO_SUCH_ATTR.get(entryDN, getRawAttributeType()));
        }
        else
        {
          appendErrorMessage(WARN_COMPARE_OP_NO_SUCH_ATTR_WITH_OPTIONS.get(
              String.valueOf(entryDN), getRawAttributeType()));
          appendErrorMessage(WARN_COMPARE_OP_NO_SUCH_ATTR_WITH_OPTIONS.get(entryDN, getRawAttributeType()));
        }
      }
      else
@@ -338,7 +333,7 @@
  {
    return LocalBackendWorkflowElement.newDirectoryException(this, entry, null,
        resultCode, message, ResultCode.NO_SUCH_OBJECT,
        ERR_COMPARE_NO_SUCH_ENTRY.get(String.valueOf(entryDN)));
        ERR_COMPARE_NO_SUCH_ENTRY.get(entryDN));
  }

  private void setResultCodeAndMessageNoInfoDisclosure(Entry entry, DN entryDN,
@@ -346,7 +341,7 @@
  {
    LocalBackendWorkflowElement.setResultCodeAndMessageNoInfoDisclosure(this,
        entry, entryDN, realResultCode, realMessage, ResultCode.NO_SUCH_OBJECT,
        ERR_COMPARE_NO_SUCH_ENTRY.get(String.valueOf(entryDN)));
        ERR_COMPARE_NO_SUCH_ENTRY.get(entryDN));
  }

  private DN findMatchedDN(DN entryDN)
@@ -403,9 +398,7 @@
            logger.traceException(de);

            throw newDirectoryException(entry, de.getResultCode(),
                           ERR_COMPARE_CANNOT_PROCESS_ASSERTION_FILTER.get(
                                String.valueOf(entryDN),
                                de.getMessageObject()));
                ERR_COMPARE_CANNOT_PROCESS_ASSERTION_FILTER.get(entryDN, de.getMessageObject()));
          }

          // Check if the current user has permission to make
@@ -423,8 +416,7 @@
            if (!filter.matchesEntry(entry))
            {
              throw newDirectoryException(entry, ResultCode.ASSERTION_FAILED,
                  ERR_COMPARE_ASSERTION_FAILED.get(String
                      .valueOf(entryDN)));
                  ERR_COMPARE_ASSERTION_FAILED.get(entryDN));
            }
          }
          catch (DirectoryException de)
@@ -437,9 +429,7 @@
            logger.traceException(de);

            throw newDirectoryException(entry, de.getResultCode(),
                           ERR_COMPARE_CANNOT_PROCESS_ASSERTION_FILTER.get(
                                String.valueOf(entryDN),
                                de.getMessageObject()));
                ERR_COMPARE_CANNOT_PROCESS_ASSERTION_FILTER.get(entryDN, de.getMessageObject()));
          }
        }
        else if (oid.equals(OID_PROXIED_AUTH_V1))
@@ -501,9 +491,8 @@
          if ((backend == null) || (! backend.supportsControl(oid)))
          {
            throw new DirectoryException(
                           ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
                           ERR_COMPARE_UNSUPPORTED_CRITICAL_CONTROL.get(
                                String.valueOf(entryDN), oid));
                ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
                ERR_COMPARE_UNSUPPORTED_CRITICAL_CONTROL.get(entryDN, oid));
          }
        }
      }

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

@@ -231,8 +231,7 @@
      if (entryLock == null)
      {
        setResultCode(ResultCode.BUSY);
        appendErrorMessage(ERR_DELETE_CANNOT_LOCK_ENTRY.get(
            String.valueOf(entryDN)));
        appendErrorMessage(ERR_DELETE_CANNOT_LOCK_ENTRY.get(entryDN));
        return;
      }

@@ -241,8 +240,7 @@
      if (entry == null)
      {
        setResultCode(ResultCode.NO_SUCH_OBJECT);
        appendErrorMessage(ERR_DELETE_NO_SUCH_ENTRY
            .get(String.valueOf(entryDN)));
        appendErrorMessage(ERR_DELETE_NO_SUCH_ENTRY.get(entryDN));

        setMatchedDN(findMatchedDN(entryDN));
        return;
@@ -273,8 +271,7 @@
        {
          setResultCodeAndMessageNoInfoDisclosure(entry,
              ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
              ERR_DELETE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(String
                  .valueOf(entryDN)));
              ERR_DELETE_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(entryDN));
          return;
        }
      }
@@ -310,8 +307,7 @@
      if (backend == null)
      {
        setResultCode(ResultCode.NO_SUCH_OBJECT);
        appendErrorMessage(ERR_DELETE_NO_SUCH_ENTRY
            .get(String.valueOf(entryDN)));
        appendErrorMessage(ERR_DELETE_NO_SUCH_ENTRY.get(entryDN));
        return;
      }

@@ -332,8 +328,7 @@
          {
            setResultCodeAndMessageNoInfoDisclosure(entry,
                ResultCode.NOT_ALLOWED_ON_NONLEAF,
                ERR_DELETE_HAS_SUB_BACKEND.get(String.valueOf(entryDN),
                    String.valueOf(dn)));
                ERR_DELETE_HAS_SUB_BACKEND.get(entryDN, dn));
            return;
          }
        }
@@ -384,7 +379,7 @@
    return LocalBackendWorkflowElement.newDirectoryException(this, entry,
        entryDN,
        resultCode, message, ResultCode.NO_SUCH_OBJECT,
        ERR_DELETE_NO_SUCH_ENTRY.get(String.valueOf(entryDN)));
        ERR_DELETE_NO_SUCH_ENTRY.get(entryDN));
  }

  private void setResultCodeAndMessageNoInfoDisclosure(Entry entry,
@@ -392,7 +387,7 @@
  {
    LocalBackendWorkflowElement.setResultCodeAndMessageNoInfoDisclosure(this,
        entry, entryDN, resultCode, message, ResultCode.NO_SUCH_OBJECT,
        ERR_DELETE_NO_SUCH_ENTRY.get(String.valueOf(entryDN)));
        ERR_DELETE_NO_SUCH_ENTRY.get(entryDN));
  }

  private DN findMatchedDN(DN entryDN)
@@ -448,9 +443,7 @@
            logger.traceException(de);

            throw newDirectoryException(entry, de.getResultCode(),
                           ERR_DELETE_CANNOT_PROCESS_ASSERTION_FILTER.get(
                                String.valueOf(entryDN),
                                de.getMessageObject()));
                ERR_DELETE_CANNOT_PROCESS_ASSERTION_FILTER.get(entryDN, de.getMessageObject()));
          }

          // Check if the current user has permission to make
@@ -468,7 +461,7 @@
            if (!filter.matchesEntry(entry))
            {
              throw newDirectoryException(entry, ResultCode.ASSERTION_FAILED,
                  ERR_DELETE_ASSERTION_FAILED.get(String.valueOf(entryDN)));
                  ERR_DELETE_ASSERTION_FAILED.get(entryDN));
            }
          }
          catch (DirectoryException de)
@@ -481,9 +474,7 @@
            logger.traceException(de);

            throw newDirectoryException(entry, de.getResultCode(),
                           ERR_DELETE_CANNOT_PROCESS_ASSERTION_FILTER.get(
                                String.valueOf(entryDN),
                                de.getMessageObject()));
                ERR_DELETE_CANNOT_PROCESS_ASSERTION_FILTER.get(entryDN, de.getMessageObject()));
          }
        }
        else if (oid.equals(OID_LDAP_NOOP_OPENLDAP_ASSIGNED))
@@ -555,9 +546,8 @@
          if ((backend == null) || (! backend.supportsControl(oid)))
          {
            throw newDirectoryException(entry,
                           ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
                           ERR_DELETE_UNSUPPORTED_CRITICAL_CONTROL.get(
                                String.valueOf(entryDN), oid));
                ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
                ERR_DELETE_UNSUPPORTED_CRITICAL_CONTROL.get(entryDN, oid));
          }
        }
      }

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

@@ -275,8 +275,7 @@
      if (newSuperior.isDescendantOf(entryDN))
      {
        setResultCode(ResultCode.UNWILLING_TO_PERFORM);
        appendErrorMessage(ERR_MODDN_NEW_SUPERIOR_IN_SUBTREE.get(String
            .valueOf(entryDN), String.valueOf(newSuperior)));
        appendErrorMessage(ERR_MODDN_NEW_SUPERIOR_IN_SUBTREE.get(entryDN, newSuperior));
        return;
      }
      parentDN = newSuperior;
@@ -285,7 +284,7 @@
    if (parentDN == null || parentDN.isRootDN())
    {
      setResultCode(ResultCode.UNWILLING_TO_PERFORM);
      appendErrorMessage(ERR_MODDN_NO_PARENT.get(String.valueOf(entryDN)));
      appendErrorMessage(ERR_MODDN_NO_PARENT.get(entryDN));
      return;
    }

@@ -297,8 +296,7 @@
    if (currentBackend == null)
    {
      setResultCode(ResultCode.NO_SUCH_OBJECT);
      appendErrorMessage(ERR_MODDN_NO_BACKEND_FOR_CURRENT_ENTRY.get(String
          .valueOf(entryDN)));
      appendErrorMessage(ERR_MODDN_NO_BACKEND_FOR_CURRENT_ENTRY.get(entryDN));
      return;
    }

@@ -306,15 +304,13 @@
    if (newBackend == null)
    {
      setResultCode(ResultCode.NO_SUCH_OBJECT);
      appendErrorMessage(ERR_MODDN_NO_BACKEND_FOR_NEW_ENTRY.get(String
          .valueOf(entryDN), String.valueOf(newDN)));
      appendErrorMessage(ERR_MODDN_NO_BACKEND_FOR_NEW_ENTRY.get(entryDN, newDN));
      return;
    }
    else if (!currentBackend.equals(newBackend))
    {
      setResultCode(ResultCode.UNWILLING_TO_PERFORM);
      appendErrorMessage(ERR_MODDN_DIFFERENT_BACKENDS.get(String
          .valueOf(entryDN), String.valueOf(newDN)));
      appendErrorMessage(ERR_MODDN_DIFFERENT_BACKENDS.get(entryDN, newDN));
      return;
    }

@@ -330,8 +326,7 @@
      if (currentLock == null)
      {
        setResultCode(ResultCode.BUSY);
        appendErrorMessage(ERR_MODDN_CANNOT_LOCK_CURRENT_DN.get(
            String.valueOf(entryDN)));
        appendErrorMessage(ERR_MODDN_CANNOT_LOCK_CURRENT_DN.get(entryDN));
        return;
      }

@@ -341,8 +336,7 @@
        if (newLock == null)
        {
          setResultCode(ResultCode.BUSY);
          appendErrorMessage(ERR_MODDN_CANNOT_LOCK_NEW_DN.get(
              String.valueOf(entryDN), String.valueOf(newDN)));
          appendErrorMessage(ERR_MODDN_CANNOT_LOCK_NEW_DN.get(entryDN, newDN));
          return;
        }
      }
@@ -352,8 +346,7 @@

        setResultCodeAndMessageNoInfoDisclosure(null, newDN,
            DirectoryServer.getServerErrorResultCode(),
            ERR_MODDN_EXCEPTION_LOCKING_NEW_DN.get(String.valueOf(entryDN),
                String.valueOf(newDN), getExceptionMessage(e)));
            ERR_MODDN_EXCEPTION_LOCKING_NEW_DN.get(entryDN, newDN, getExceptionMessage(e)));
        return;
      }

@@ -370,8 +363,7 @@
        setMatchedDN(findMatchedDN(entryDN));

        setResultCode(ResultCode.NO_SUCH_OBJECT);
        appendErrorMessage(ERR_MODDN_NO_CURRENT_ENTRY.get(String
            .valueOf(entryDN)));
        appendErrorMessage(ERR_MODDN_NO_CURRENT_ENTRY.get(entryDN));
        return;
      }

@@ -396,8 +388,7 @@
        {
          setResultCodeAndMessageNoInfoDisclosure(currentEntry, entryDN,
              ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
              ERR_MODDN_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(String
                  .valueOf(entryDN)));
              ERR_MODDN_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(entryDN));
          return;
        }
      }
@@ -525,7 +516,7 @@
  {
    return LocalBackendWorkflowElement.newDirectoryException(this, entry, null,
        resultCode, message, ResultCode.NO_SUCH_OBJECT,
        ERR_MODDN_NO_CURRENT_ENTRY.get(String.valueOf(entryDN)));
        ERR_MODDN_NO_CURRENT_ENTRY.get(entryDN));
  }

  private void setResultCodeAndMessageNoInfoDisclosure(Entry entry, DN entryDN,
@@ -533,7 +524,7 @@
  {
    LocalBackendWorkflowElement.setResultCodeAndMessageNoInfoDisclosure(this,
        entry, entryDN, realResultCode, realMessage, ResultCode.NO_SUCH_OBJECT,
        ERR_MODDN_NO_CURRENT_ENTRY.get(String.valueOf(entryDN)));
        ERR_MODDN_NO_CURRENT_ENTRY.get(entryDN));
  }

  private DN findMatchedDN(DN entryDN)
@@ -591,9 +582,7 @@
            logger.traceException(de);

            throw newDirectoryException(currentEntry, de.getResultCode(),
                ERR_MODDN_CANNOT_PROCESS_ASSERTION_FILTER.get(
                    String.valueOf(entryDN),
                    de.getMessageObject()));
                ERR_MODDN_CANNOT_PROCESS_ASSERTION_FILTER.get(entryDN, de.getMessageObject()));
          }

          // Check if the current user has permission to make
@@ -612,8 +601,7 @@
            {
              throw newDirectoryException(currentEntry,
                  ResultCode.ASSERTION_FAILED,
                  ERR_MODDN_ASSERTION_FAILED.get(String
                      .valueOf(entryDN)));
                  ERR_MODDN_ASSERTION_FAILED.get(entryDN));
            }
          }
          catch (DirectoryException de)
@@ -626,9 +614,7 @@
            logger.traceException(de);

            throw newDirectoryException(currentEntry, de.getResultCode(),
                ERR_MODDN_CANNOT_PROCESS_ASSERTION_FILTER.get(
                    String.valueOf(entryDN),
                    de.getMessageObject()));
                ERR_MODDN_CANNOT_PROCESS_ASSERTION_FILTER.get(entryDN, de.getMessageObject()));
          }
        }
        else if (oid.equals(OID_LDAP_NOOP_OPENLDAP_ASSIGNED))
@@ -714,9 +700,8 @@
          if ((backend == null) || (! backend.supportsControl(oid)))
          {
            throw new DirectoryException(
                           ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
                           ERR_MODDN_UNSUPPORTED_CRITICAL_CONTROL.get(
                                String.valueOf(entryDN), oid));
                ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
                ERR_MODDN_UNSUPPORTED_CRITICAL_CONTROL.get(entryDN, oid));
          }
        }
      }
@@ -756,8 +741,7 @@
          if (! (isInternalOperation() || isSynchronizationOperation()))
          {
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                           ERR_MODDN_OLD_RDN_ATTR_IS_NO_USER_MOD.get(
                                String.valueOf(entryDN), a.getName()));
                ERR_MODDN_OLD_RDN_ATTR_IS_NO_USER_MOD.get(entryDN, a.getName()));
          }
        }

@@ -793,8 +777,7 @@
          if (! (isInternalOperation() || isSynchronizationOperation()))
          {
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                           ERR_MODDN_NEW_RDN_ATTR_IS_NO_USER_MOD.get(
                                String.valueOf(entryDN), a.getName()));
                ERR_MODDN_NEW_RDN_ATTR_IS_NO_USER_MOD.get(entryDN, a.getName()));
          }
        }
        else
@@ -814,9 +797,7 @@
                                      invalidReason))
      {
        throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION,
                                     ERR_MODDN_VIOLATES_SCHEMA.get(
                                          String.valueOf(entryDN),
                                          String.valueOf(invalidReason)));
            ERR_MODDN_VIOLATES_SCHEMA.get(entryDN, invalidReason));
      }

      for (int i=0; i < newRDNValues; i++)
@@ -825,9 +806,7 @@
        if (at.isObsolete())
        {
          throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                       ERR_MODDN_NEWRDN_ATTR_IS_OBSOLETE.get(
                                            String.valueOf(entryDN),
                                            at.getNameOrOID()));
              ERR_MODDN_NEWRDN_ATTR_IS_OBSOLETE.get(entryDN, at.getNameOrOID()));
        }
      }
    }
@@ -891,9 +870,7 @@
                                      invalidReason))
      {
        throw new DirectoryException(ResultCode.OBJECTCLASS_VIOLATION,
                                     ERR_MODDN_PREOP_VIOLATES_SCHEMA.get(
                                          String.valueOf(entryDN),
                                          String.valueOf(invalidReason)));
            ERR_MODDN_PREOP_VIOLATES_SCHEMA.get(entryDN, invalidReason));
      }
    }
  }

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

@@ -392,8 +392,7 @@
    if (modifications.isEmpty())
    {
      setResultCode(ResultCode.CONSTRAINT_VIOLATION);
      appendErrorMessage(ERR_MODIFY_NO_MODIFICATIONS.get(String
          .valueOf(entryDN)));
      appendErrorMessage(ERR_MODIFY_NO_MODIFICATIONS.get(entryDN));
      return;
    }

@@ -408,8 +407,7 @@
      if (entryLock == null)
      {
        setResultCode(ResultCode.BUSY);
        appendErrorMessage(ERR_MODIFY_CANNOT_LOCK_ENTRY.get(
            String.valueOf(entryDN)));
        appendErrorMessage(ERR_MODIFY_CANNOT_LOCK_ENTRY.get(entryDN));
        return;
      }

@@ -422,8 +420,7 @@
      if (currentEntry == null)
      {
        setResultCode(ResultCode.NO_SUCH_OBJECT);
        appendErrorMessage(ERR_MODIFY_NO_SUCH_ENTRY
            .get(String.valueOf(entryDN)));
        appendErrorMessage(ERR_MODIFY_NO_SUCH_ENTRY.get(entryDN));

        // See if one of the entry's ancestors exists.
        setMatchedDN(findMatchedDN(entryDN));
@@ -457,7 +454,7 @@
            pwpErrorType = PasswordPolicyErrorType.CHANGE_AFTER_RESET;
            setResultCode(ResultCode.CONSTRAINT_VIOLATION);
            appendErrorMessage(ERR_MODIFY_MUST_CHANGE_PASSWORD
                .get(authzDN != null ? String.valueOf(authzDN) : "anonymous"));
                .get(authzDN != null ? authzDN : "anonymous"));
            return;
          }
        }
@@ -500,8 +497,7 @@
        {
          setResultCodeAndMessageNoInfoDisclosure(modifiedEntry,
              ResultCode.INSUFFICIENT_ACCESS_RIGHTS,
              ERR_MODIFY_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(String
                  .valueOf(entryDN)));
              ERR_MODIFY_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(entryDN));
          return;
        }
      }
@@ -522,7 +518,7 @@
        pwpErrorType = PasswordPolicyErrorType.CHANGE_AFTER_RESET;
        setResultCode(ResultCode.CONSTRAINT_VIOLATION);
        appendErrorMessage(ERR_MODIFY_MUST_CHANGE_PASSWORD
            .get(authzDN != null ? String.valueOf(authzDN) : "anonymous"));
            .get(authzDN != null ? authzDN : "anonymous"));
        return;
      }

@@ -536,8 +532,7 @@
            invalidReason))
        {
          setResultCode(ResultCode.OBJECTCLASS_VIOLATION);
          appendErrorMessage(ERR_MODIFY_VIOLATES_SCHEMA.get(String
              .valueOf(entryDN), invalidReason));
          appendErrorMessage(ERR_MODIFY_VIOLATES_SCHEMA.get(entryDN, invalidReason));
          return;
        }
      }
@@ -568,8 +563,7 @@
      if (backend == null)
      {
        setResultCode(ResultCode.NO_SUCH_OBJECT);
        appendErrorMessage(ERR_MODIFY_NO_BACKEND_FOR_ENTRY.get(String
            .valueOf(entryDN)));
        appendErrorMessage(ERR_MODIFY_NO_BACKEND_FOR_ENTRY.get(entryDN));
        return;
      }

@@ -628,7 +622,7 @@
  {
    return LocalBackendWorkflowElement.newDirectoryException(this, entry,
        entryDN, resultCode, message, ResultCode.NO_SUCH_OBJECT,
        ERR_MODIFY_NO_SUCH_ENTRY.get(String.valueOf(entryDN)));
        ERR_MODIFY_NO_SUCH_ENTRY.get(entryDN));
  }

  private void setResultCodeAndMessageNoInfoDisclosure(Entry entry,
@@ -636,7 +630,7 @@
  {
    LocalBackendWorkflowElement.setResultCodeAndMessageNoInfoDisclosure(this,
        entry, entryDN, realResultCode, realMessage, ResultCode.NO_SUCH_OBJECT,
        ERR_MODIFY_NO_SUCH_ENTRY.get(String.valueOf(entryDN)));
        ERR_MODIFY_NO_SUCH_ENTRY.get(entryDN));
  }

  private DN findMatchedDN(DN entryDN)
@@ -694,9 +688,8 @@
            logger.traceException(de);

            throw newDirectoryException(currentEntry, de.getResultCode(),
                           ERR_MODIFY_CANNOT_PROCESS_ASSERTION_FILTER.get(
                                String.valueOf(entryDN),
                                de.getMessageObject()));
                ERR_MODIFY_CANNOT_PROCESS_ASSERTION_FILTER.get(
                    entryDN, de.getMessageObject()));
          }

          // Check if the current user has permission to make
@@ -715,7 +708,7 @@
            {
              throw newDirectoryException(currentEntry,
                  ResultCode.ASSERTION_FAILED,
                  ERR_MODIFY_ASSERTION_FAILED.get(String.valueOf(entryDN)));
                  ERR_MODIFY_ASSERTION_FAILED.get(entryDN));
            }
          }
          catch (DirectoryException de)
@@ -728,9 +721,8 @@
            logger.traceException(de);

            throw newDirectoryException(currentEntry, de.getResultCode(),
                           ERR_MODIFY_CANNOT_PROCESS_ASSERTION_FILTER.get(
                                String.valueOf(entryDN),
                                de.getMessageObject()));
                ERR_MODIFY_CANNOT_PROCESS_ASSERTION_FILTER.get(
                    entryDN, de.getMessageObject()));
          }
        }
        else if (oid.equals(OID_LDAP_NOOP_OPENLDAP_ASSIGNED))
@@ -822,9 +814,8 @@
          if ((backend == null) || (! backend.supportsControl(oid)))
          {
            throw newDirectoryException(currentEntry,
                           ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
                           ERR_MODIFY_UNSUPPORTED_CRITICAL_CONTROL.get(
                                String.valueOf(entryDN), oid));
                ResultCode.UNAVAILABLE_CRITICAL_EXTENSION,
                ERR_MODIFY_UNSUPPORTED_CRITICAL_CONTROL.get(entryDN, oid));
          }
        }
      }
@@ -856,8 +847,7 @@
        {
          throw newDirectoryException(currentEntry,
              ResultCode.CONSTRAINT_VIOLATION,
              ERR_MODIFY_ATTR_IS_NO_USER_MOD.get(
                          String.valueOf(entryDN), a.getName()));
              ERR_MODIFY_ATTR_IS_NO_USER_MOD.get(entryDN, a.getName()));
        }
      }

@@ -874,8 +864,7 @@
          {
            throw newDirectoryException(currentEntry,
                ResultCode.CONSTRAINT_VIOLATION,
                ERR_MODIFY_ATTR_IS_OBSOLETE.get(
                            String.valueOf(entryDN), a.getName()));
                ERR_MODIFY_ATTR_IS_OBSOLETE.get(entryDN, a.getName()));
          }
        }
      }
@@ -1078,8 +1067,8 @@

          default:
            throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                ERR_MODIFY_INVALID_MOD_TYPE_FOR_PASSWORD.get(String.valueOf(m
                    .getModificationType()), a.getName()));
                ERR_MODIFY_INVALID_MOD_TYPE_FOR_PASSWORD.get(
                    m.getModificationType(), a.getName()));
          }

          // Password processing may have changed the attribute in
@@ -1378,8 +1367,7 @@
    if (attr.isEmpty())
    {
      throw newDirectoryException(currentEntry, ResultCode.PROTOCOL_ERROR,
          ERR_MODIFY_ADD_NO_VALUES.get(String.valueOf(entryDN),
              attr.getName()));
          ERR_MODIFY_ADD_NO_VALUES.get(entryDN, attr.getName()));
    }

    // If the server is configured to check schema and the operation
@@ -1403,8 +1391,7 @@
              // Value is not human-readable
              throw newDirectoryException(currentEntry,
                  ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                  ERR_MODIFY_ADD_INVALID_SYNTAX_NO_VALUE.get(
                      String.valueOf(entryDN), attr.getName(), invalidReason));
                  ERR_MODIFY_ADD_INVALID_SYNTAX_NO_VALUE.get(entryDN, attr.getName(), invalidReason));
            }
            else
            {
@@ -1429,8 +1416,7 @@
            if (!syntax.isHumanReadable() || syntax.isBinary())
            {
              // Value is not human-readable
              logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX_NO_VALUE.get(String
                  .valueOf(entryDN), attr.getName(), invalidReason));
              logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX_NO_VALUE.get(entryDN, attr.getName(), invalidReason));
            }
            else
            {
@@ -1462,8 +1448,7 @@

      throw newDirectoryException(currentEntry,
          ResultCode.ATTRIBUTE_OR_VALUE_EXISTS,
          ERR_MODIFY_ADD_DUPLICATE_VALUE.get(
              String.valueOf(entryDN), attr.getName(), duplicateValuesStr));
          ERR_MODIFY_ADD_DUPLICATE_VALUE.get(entryDN, attr.getName(), duplicateValuesStr));
    }
  }

@@ -1503,14 +1488,14 @@
      {
        throw newDirectoryException(currentEntry,
            ResultCode.OBJECTCLASS_VIOLATION,
            ERR_ENTRY_ADD_UNKNOWN_OC.get(name, String.valueOf(entryDN)));
            ERR_ENTRY_ADD_UNKNOWN_OC.get(name, entryDN));
      }

      if (oc.isObsolete())
      {
        throw newDirectoryException(currentEntry,
            ResultCode.CONSTRAINT_VIOLATION,
            ERR_ENTRY_ADD_OBSOLETE_OC.get(name, String.valueOf(entryDN)));
            ERR_ENTRY_ADD_OBSOLETE_OC.get(name, entryDN));
      }
    }
  }
@@ -1549,8 +1534,7 @@
        {
          throw newDirectoryException(currentEntry,
              ResultCode.NOT_ALLOWED_ON_RDN,
              ERR_MODIFY_DELETE_RDN_ATTR.get(
                  String.valueOf(entryDN), attr.getName()));
              ERR_MODIFY_DELETE_RDN_ATTR.get(entryDN, attr.getName()));
        }
      }
      else
@@ -1561,8 +1545,7 @@

          throw newDirectoryException(currentEntry,
              ResultCode.NO_SUCH_ATTRIBUTE,
              ERR_MODIFY_DELETE_MISSING_VALUES.get(
                  String.valueOf(entryDN), attr.getName(), missingValuesStr));
              ERR_MODIFY_DELETE_MISSING_VALUES.get(entryDN, attr.getName(), missingValuesStr));
        }
      }
    }
@@ -1571,8 +1554,7 @@
      if (! permissiveModify)
      {
        throw newDirectoryException(currentEntry, ResultCode.NO_SUCH_ATTRIBUTE,
                     ERR_MODIFY_DELETE_NO_SUCH_ATTR.get(
                          String.valueOf(entryDN), attr.getName()));
            ERR_MODIFY_DELETE_NO_SUCH_ATTR.get(entryDN, attr.getName()));
      }
    }
  }
@@ -1613,15 +1595,14 @@
              // Value is not human-readable
              throw newDirectoryException(currentEntry,
                  ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                  ERR_MODIFY_REPLACE_INVALID_SYNTAX_NO_VALUE.get(
                      String.valueOf(entryDN), attr.getName(), invalidReason));
                  ERR_MODIFY_REPLACE_INVALID_SYNTAX_NO_VALUE.get(entryDN, attr.getName(), invalidReason));
            }
            else
            {
              throw newDirectoryException(currentEntry,
                  ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                  ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(String.valueOf(entryDN),
                      attr.getName(), v.getValue(), invalidReason));
                  ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(
                      entryDN, attr.getName(), v.getValue(), invalidReason));
            }
          }
        }
@@ -1637,14 +1618,13 @@
            if (!syntax.isHumanReadable() || syntax.isBinary())
            {
              // Value is not human-readable
              logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX_NO_VALUE.get(String
                  .valueOf(entryDN), attr.getName(), invalidReason));
              logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX_NO_VALUE.get(
                  entryDN, attr.getName(), invalidReason));
            }
            else
            {
              logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(String
                  .valueOf(entryDN), attr.getName(), v.getValue(),
                  invalidReason));
              logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(
                  entryDN, attr.getName(), v.getValue(), invalidReason));
            }
            invalidReason = new LocalizableMessageBuilder();
          }
@@ -1672,8 +1652,7 @@
            .getAttributeValue(t))))
    {
      throw newDirectoryException(modifiedEntry, ResultCode.NOT_ALLOWED_ON_RDN,
          ERR_MODIFY_DELETE_RDN_ATTR.get(String.valueOf(entryDN), attr
              .getName()));
          ERR_MODIFY_DELETE_RDN_ATTR.get(entryDN, attr.getName()));
    }
  }

@@ -1698,8 +1677,7 @@
    if ((rdn != null) && rdn.hasAttributeType(t))
    {
      throw newDirectoryException(modifiedEntry, ResultCode.NOT_ALLOWED_ON_RDN,
          ERR_MODIFY_INCREMENT_RDN.get(String.valueOf(entryDN),
              attr.getName()));
          ERR_MODIFY_INCREMENT_RDN.get(entryDN, attr.getName()));
    }

    // The provided attribute must have a single value, and it must be
@@ -1707,15 +1685,13 @@
    if (attr.isEmpty())
    {
      throw newDirectoryException(modifiedEntry, ResultCode.PROTOCOL_ERROR,
          ERR_MODIFY_INCREMENT_REQUIRES_VALUE.get(String.valueOf(entryDN), attr
              .getName()));
          ERR_MODIFY_INCREMENT_REQUIRES_VALUE.get(entryDN, attr.getName()));
    }

    if (attr.size() > 1)
    {
      throw newDirectoryException(modifiedEntry, ResultCode.PROTOCOL_ERROR,
          ERR_MODIFY_INCREMENT_REQUIRES_SINGLE_VALUE.get(String
              .valueOf(entryDN), attr.getName()));
          ERR_MODIFY_INCREMENT_REQUIRES_SINGLE_VALUE.get(entryDN, attr.getName()));
    }

    AttributeValue v = attr.iterator().next();
@@ -1730,8 +1706,7 @@
      logger.traceException(e);

      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
          ERR_MODIFY_INCREMENT_PROVIDED_VALUE_NOT_INTEGER.get(String
              .valueOf(entryDN), attr.getName(), v.getValue()), e);
          ERR_MODIFY_INCREMENT_PROVIDED_VALUE_NOT_INTEGER.get(entryDN, attr.getName(), v.getValue()), e);
    }

    // Get the attribute that is to be incremented.
@@ -1740,8 +1715,7 @@
    {
      throw newDirectoryException(modifiedEntry,
          ResultCode.CONSTRAINT_VIOLATION,
          ERR_MODIFY_INCREMENT_REQUIRES_EXISTING_VALUE.get(String
              .valueOf(entryDN), attr.getName()));
          ERR_MODIFY_INCREMENT_REQUIRES_EXISTING_VALUE.get(entryDN, attr.getName()));
    }

    // Increment each attribute value by the specified amount.
@@ -1760,9 +1734,8 @@

        throw new DirectoryException(
            ResultCode.INVALID_ATTRIBUTE_SYNTAX,
            ERR_MODIFY_INCREMENT_REQUIRES_INTEGER_VALUE.get(String
                .valueOf(entryDN), a.getName(),
                existingValue.getValue()),
            ERR_MODIFY_INCREMENT_REQUIRES_INTEGER_VALUE.get(
                entryDN, a.getName(), existingValue.getValue()),
            e);
      }


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

@@ -194,8 +194,7 @@
          .isAllowed(this))
      {
        setResultCode(ResultCode.INSUFFICIENT_ACCESS_RIGHTS);
        appendErrorMessage(ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS
            .get(String.valueOf(baseDN)));
        appendErrorMessage(ERR_SEARCH_AUTHZ_INSUFFICIENT_ACCESS_RIGHTS.get(baseDN));
        return;
      }
    }
@@ -234,8 +233,7 @@
    if (backend == null)
    {
      setResultCode(ResultCode.NO_SUCH_OBJECT);
      appendErrorMessage(ERR_SEARCH_BASE_DOESNT_EXIST.get(String
          .valueOf(baseDN)));
      appendErrorMessage(ERR_SEARCH_BASE_DOESNT_EXIST.get(baseDN));
      return;
    }