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

Jean-Noel Rouvignac

31.49.2014 a1f030edc5d19b575470f0d79033d9f7471ab172

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

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/datamodel/MonitoringTableModel.java

@@ -388,8 +388,7 @@
   */
  private String getAverageHeader(MonitoringAttributes attr)
  {
    return getHeader(INFO_CTRL_PANEL_AVERAGE_HEADER.get(
        attr.getMessage().toString()), 15);
    return getHeader(INFO_CTRL_PANEL_AVERAGE_HEADER.get(attr.getMessage()), 15);
  }

  /**

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/DeleteBaseDNAndBackendTask.java

@@ -754,8 +754,7 @@
              args.add(getNoPropertiesFileArgument());
              printEquivalentCommandLine(
                  getConfigCommandLinePath(baseDN.getBackend()),
                  args, INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_DOMAIN.get(
                      baseDN.getDn().toString()));
                  args, INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_DELETE_DOMAIN.get(baseDN.getDn()));
              }
          });
        }
@@ -765,8 +764,7 @@
          {
            getProgressDialog().appendProgressHtml(
                Utilities.getProgressWithPoints(
                    INFO_CTRL_PANEL_DELETING_DOMAIN.get(
                        baseDN.getDn().toString()),
                    INFO_CTRL_PANEL_DELETING_DOMAIN.get(baseDN.getDn()),
                    ColorAndFontConstants.progressFont));
          }
        });

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/DeleteEntryTask.java

@@ -350,8 +350,7 @@
          getProgressDialog().setSummary(
              LocalizableMessage.raw(
                  Utilities.applyFont(
                      INFO_CTRL_PANEL_DELETING_ENTRY_SUMMARY.get(
                          lastDn.toString()).toString(),
                      INFO_CTRL_PANEL_DELETING_ENTRY_SUMMARY.get(lastDn),
                          ColorAndFontConstants.defaultFont)));
        }
      });
@@ -452,8 +451,7 @@
        getProgressDialog().setSummary(
            LocalizableMessage.raw(
                Utilities.applyFont(
                    INFO_CTRL_PANEL_DELETING_ENTRY_SUMMARY.get(
                        lastDn.toString()).toString(),
                    INFO_CTRL_PANEL_DELETING_ENTRY_SUMMARY.get(lastDn),
                        ColorAndFontConstants.defaultFont)));
      }
    });

 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/RestartServerTask.java

@@ -136,7 +136,7 @@
            INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_STOP_SERVER.get());
        dlg.setSummary(LocalizableMessage.raw(
            Utilities.applyFont(
            INFO_CTRL_PANEL_STOPPING_SERVER_SUMMARY.get().toString(),
            INFO_CTRL_PANEL_STOPPING_SERVER_SUMMARY.get(),
            ColorAndFontConstants.defaultFont)));
      }
    });
@@ -173,7 +173,7 @@

            dlg.setSummary(LocalizableMessage.raw(
                Utilities.applyFont(
                INFO_CTRL_PANEL_STARTING_SERVER_SUMMARY.get().toString(),
                INFO_CTRL_PANEL_STARTING_SERVER_SUMMARY.get(),
                ColorAndFontConstants.defaultFont)));
          }
        });

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

@@ -1110,7 +1110,6 @@
      Task taskToBeLaunched)
  {
    return INFO_CTRL_PANEL_INCOMPATIBLE_TASKS.get(
        taskRunning.getTaskDescription().toString(),
        taskToBeLaunched.getTaskDescription().toString());
        taskRunning.getTaskDescription(), taskToBeLaunched.getTaskDescription());
  }
}

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

@@ -715,8 +715,7 @@
    }
    catch (LDAPException le)
    {
      errors.add(INFO_CTRL_PANEL_INVALID_FILTER_DETAILS.get(
          le.getMessageObject().toString()));
      errors.add(INFO_CTRL_PANEL_INVALID_FILTER_DETAILS.get(le.getMessageObject()));
      setPrimaryInvalid(lFilter);
    }
    if (errors.isEmpty())
@@ -1409,15 +1408,13 @@
        catch (NamingException ne)
        {
          errorTitle = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_DETAILS.get();
          errorDetails = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_SUMMARY.get(
              ne.toString());
          errorDetails = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_SUMMARY.get(ne);
          displayErrorPane = true;
        }
        catch (ConfigReadException cre)
        {
          errorTitle = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_DETAILS.get();
          errorDetails = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_SUMMARY.get(
              cre.getMessageObject().toString());
          errorDetails = INFO_CTRL_PANEL_ERROR_CONNECT_BROWSE_SUMMARY.get(cre.getMessageObject());
          displayErrorPane = true;
        }
      }

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

@@ -603,7 +603,7 @@
        confirm = displayConfirmationDialog(
            INFO_CTRL_PANEL_VLV_INDEXES_NOT_DEFINED_CONFIRMATION_TITLE.get(),
            INFO_CTRL_PANEL_VLV_INDEXES_NOT_DEFINED_CONFIRMATION_MSG.get(
                getBackend().getBackendID(), sb.toString()));
                getBackend().getBackendID(), sb));
      }
    }
    catch (Throwable t)
@@ -797,8 +797,7 @@
      }
      catch (OpenDsException oe)
      {
        errors.add(ERR_CTRL_PANEL_INVALID_BASE_DN_FOR_VLV_PROVIDED.get(
            oe.getMessageObject().toString()));
        errors.add(ERR_CTRL_PANEL_INVALID_BASE_DN_FOR_VLV_PROVIDED.get(oe.getMessageObject()));
        setPrimaryInvalid(lBaseDN);
      }
    }
@@ -817,8 +816,7 @@
      }
      catch (LDAPException le)
      {
        errors.add(ERR_CTRL_PANEL_INVALID_FILTER_FOR_VLV_PROVIDED.get(
            le.getMessageObject().toString()));
        errors.add(ERR_CTRL_PANEL_INVALID_FILTER_FOR_VLV_PROVIDED.get(le.getMessageObject()));
        setPrimaryInvalid(lFilter);
      }
    }

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

@@ -403,7 +403,7 @@
        catch (OpenDsException ode)
        {
          errors.add(INFO_CTRL_PANEL_INVALID_DN_DETAILS.get(groupDn,
              ode.getMessageObject().toString()));
              ode.getMessageObject()));
        }
      }
    }

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

@@ -562,7 +562,7 @@
            else
            {
              initMsg = INFO_CTRL_PANEL_RUN_BACKUP_SUMMARY.get(
                  backends.getSelectedItem().toString());
                  backends.getSelectedItem());
            }
            launchOperation(newTask,
                initMsg,

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

@@ -139,8 +139,7 @@
      }
      catch (OpenDsException ode)
      {
        errors.add(ERR_CTRL_PANEL_INVALID_BASE_DN_PROVIDED.get(
            ode.getMessageObject().toString()));
        errors.add(ERR_CTRL_PANEL_INVALID_BASE_DN_PROVIDED.get(ode.getMessageObject()));
      }
    }


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

@@ -991,8 +991,7 @@
        LocalizableMessage elementType = NewAttributePanel.getSchemaElementType(n, schema);
        if (elementType != null)
        {
          errors.add(ERR_CTRL_PANEL_ATTRIBUTE_NAME_ALREADY_IN_USE.get(n,
              elementType.toString()));
          errors.add(ERR_CTRL_PANEL_ATTRIBUTE_NAME_ALREADY_IN_USE.get(n, elementType));
          setPrimaryInvalid(lName);
        }
      }
@@ -1011,8 +1010,7 @@
        LocalizableMessage elementType = NewAttributePanel.getSchemaElementType(n, schema);
        if (elementType != null)
        {
          errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n,
              elementType.toString()));
          errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n, elementType));
          setPrimaryInvalid(lOID);
        }
      }
@@ -1047,8 +1045,7 @@
              NewAttributePanel.getSchemaElementType(alias, schema);
            if (elementType != null)
            {
              errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n,
                  elementType.toString()));
              errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n, elementType));
              setPrimaryInvalid(lAliases);
            }
          }

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

@@ -788,8 +788,7 @@
        LocalizableMessage elementType = NewAttributePanel.getSchemaElementType(n, schema);
        if (elementType != null)
        {
          errors.add(ERR_CTRL_PANEL_OBJECTCLASS_NAME_ALREADY_IN_USE.get(n,
              elementType.toString()));
          errors.add(ERR_CTRL_PANEL_OBJECTCLASS_NAME_ALREADY_IN_USE.get(n, elementType));
          setPrimaryInvalid(lName);
        }
      }
@@ -808,8 +807,7 @@
        LocalizableMessage elementType = NewAttributePanel.getSchemaElementType(n, schema);
        if (elementType != null)
        {
          errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n,
              elementType.toString()));
          errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n, elementType));
          setPrimaryInvalid(lOID);
        }
      }
@@ -844,8 +842,7 @@
              NewAttributePanel.getSchemaElementType(alias, schema);
            if (elementType != null)
            {
              errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n,
                  elementType.toString()));
              errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n, elementType));
              setPrimaryInvalid(lAliases);
            }
          }

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

@@ -524,8 +524,7 @@
        {
          LocalizableMessage title = INFO_CTRL_PANEL_ERROR_SEARCHING_ENTRY_TITLE.get();
          LocalizableMessage details =
            ERR_CTRL_PANEL_ERROR_SEARCHING_ENTRY.get(node.getDN(),
                throwable.toString());
            ERR_CTRL_PANEL_ERROR_SEARCHING_ENTRY.get(node.getDN(), throwable);
          displayErrorMessage(title, details);
        }
        else

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

@@ -117,12 +117,11 @@
    if (t instanceof OpenDsException)
    {
      details = ERR_CTRL_PANEL_ERROR_SEARCHING_ENTRY.get(dn,
      ((OpenDsException)t).getMessageObject().toString());
      ((OpenDsException)t).getMessageObject());
    }
    else
    {
      details = ERR_CTRL_PANEL_ERROR_SEARCHING_ENTRY.get(dn,
          t.toString());
      details = ERR_CTRL_PANEL_ERROR_SEARCHING_ENTRY.get(dn, t);
    }
    updateErrorPane(errorPane, title, ColorAndFontConstants.errorTitleFont,
        details, ColorAndFontConstants.defaultFont);
@@ -169,9 +168,7 @@
            }
            else if (ex instanceof NameNotFoundException)
            {
              msg =
                ERR_CTRL_PANEL_COULD_NOT_FIND_PROVIDED_ENTRY_IN_REFERRAL.get(
                    arg.toString(), hostPort);
              msg = ERR_CTRL_PANEL_COULD_NOT_FIND_PROVIDED_ENTRY_IN_REFERRAL.get(arg, hostPort);
            }
            else
            {
@@ -186,9 +183,7 @@
            }
            else if (ex instanceof NameNotFoundException)
            {
              msg =
           ERR_CTRL_PANEL_COULD_NOT_FIND_PROVIDED_ENTRY_IN_REFERRAL_NO_HOST.get(
                    arg.toString());
              msg = ERR_CTRL_PANEL_COULD_NOT_FIND_PROVIDED_ENTRY_IN_REFERRAL_NO_HOST.get(arg);
            }
            else
            {

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

@@ -438,8 +438,7 @@
      if ((errors.isEmpty()) && confirmed)
      {
        launchOperation(newTask,
            INFO_CTRL_PANEL_EXPORTING_LDIF_SUMMARY.get(
                backends.getSelectedItem().toString()),
            INFO_CTRL_PANEL_EXPORTING_LDIF_SUMMARY.get(backends.getSelectedItem()),
            INFO_CTRL_PANEL_EXPORTING_LDIF_SUCCESSFUL_SUMMARY.get(),
            INFO_CTRL_PANEL_EXPORTING_LDIF_SUCCESSFUL_DETAILS.get(),
            ERR_CTRL_PANEL_EXPORTING_LDIF_ERROR_SUMMARY.get(),

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

@@ -22,8 +22,8 @@
 *
 *
 *      Copyright 2008-2009 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */

package org.opends.guitools.controlpanel.ui;

import static org.opends.messages.AdminToolMessages.*;
@@ -288,8 +288,7 @@
    if (panel.getTitle() != null)
    {
      setTitle(INFO_CTRL_PANEL_GENERIC_TITLE.get(
              DynamicConstants.PRODUCT_NAME,
              panel.getTitle().toString()).toString());
          DynamicConstants.PRODUCT_NAME, panel.getTitle()).toString());
    }
  }


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

@@ -22,8 +22,8 @@
 *
 *
 *      Copyright 2009 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS
 */

package org.opends.guitools.controlpanel.ui;

import static org.opends.messages.AdminToolMessages.*;
@@ -260,7 +260,7 @@
    {
      setTitle(INFO_CTRL_PANEL_GENERIC_TITLE.get(
              DynamicConstants.PRODUCT_NAME,
              panel.getTitle().toString()).toString());
              panel.getTitle()).toString());
    }
  }


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

@@ -723,8 +723,7 @@
      {
        newTask.setInitializeAll(initializeAll);
        launchOperation(newTask,
            INFO_CTRL_PANEL_IMPORTING_LDIF_SUMMARY.get(
                backends.getSelectedItem().toString()),
            INFO_CTRL_PANEL_IMPORTING_LDIF_SUMMARY.get(backends.getSelectedItem()),
            INFO_CTRL_PANEL_IMPORTING_LDIF_SUCCESSFUL_SUMMARY.get(),
            INFO_CTRL_PANEL_IMPORTING_LDIF_SUCCESSFUL_DETAILS.get(),
            ERR_CTRL_PANEL_IMPORTING_LDIF_ERROR_SUMMARY.get(),

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

@@ -547,8 +547,7 @@
      }
      catch (LDAPException le)
      {
        errors.add(ERR_CTRL_PANEL_INVALID_FILTER_DETAILS_WITH_VALUE.get(s,
            le.getMessageObject().toString()));
        errors.add(ERR_CTRL_PANEL_INVALID_FILTER_DETAILS_WITH_VALUE.get(s, le.getMessageObject()));
        setPrimaryInvalid(lFilter);
      }
    }

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

@@ -786,8 +786,7 @@
        File javaFile = getJavaFile(file);
        if (!javaFile.exists())
        {
          javaHomeErrors.add(ERR_CTRL_PANEL_JAVA_BINARY_NOT_FOUND.get(
              javaFile.toString()));
          javaHomeErrors.add(ERR_CTRL_PANEL_JAVA_BINARY_NOT_FOUND.get(javaFile));
        }
      }
    }
@@ -871,14 +870,14 @@
              {
                confirmationMessage =
                  INFO_CTRL_PANEL_CONFIRM_NOT_WORKING_ARGUMENTS_DETAILS.get(
                    javaFile.toString(),
                    javaFile,
                    Utilities.getStringFromCollection(notWorkingArgs, "<br>-"));
              }
              else
              {
                confirmationMessage =
             INFO_CTRL_PANEL_CONFIRM_NOT_WORKING_FALLBACK_ARGUMENTS_DETAILS.get(
                    javaFile.toString(),
                    javaFile,
                    Utilities.getStringFromCollection(notWorkingArgs, "<br>-"));
              }
              confirmationMessages.add(confirmationMessage);

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

@@ -613,8 +613,7 @@
    }
    catch (OpenDsException ode)
    {
      errors.add(ERR_CTRL_PANEL_INVALID_ENTRY.get(
          ode.getMessageObject().toString()));
      errors.add(ERR_CTRL_PANEL_INVALID_ENTRY.get(ode.getMessageObject()));
    }
    if (errors.size() > 0)
    {

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

@@ -401,8 +401,7 @@
      LocalizableMessage elementType = getSchemaElementType(n, schema);
      if (elementType != null)
      {
        errors.add(ERR_CTRL_PANEL_ATTRIBUTE_NAME_ALREADY_IN_USE.get(n,
            elementType.toString()));
        errors.add(ERR_CTRL_PANEL_ATTRIBUTE_NAME_ALREADY_IN_USE.get(n, elementType));
        setPrimaryInvalid(lName);
      }
    }
@@ -421,8 +420,7 @@
        LocalizableMessage elementType = getSchemaElementType(n, schema);
        if (elementType != null)
        {
          errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n,
              elementType.toString()));
          errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n, elementType));
          setPrimaryInvalid(lOID);
        }
      }
@@ -445,8 +443,7 @@
            LocalizableMessage elementType = getSchemaElementType(alias, schema);
            if (elementType != null)
            {
              errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n,
                  elementType.toString()));
              errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n, elementType));
              setPrimaryInvalid(lAliases);
            }
          }

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

@@ -557,8 +557,7 @@
            {
              if (backendName.equalsIgnoreCase(backend.getBackendID()))
              {
                errors.add(ERR_BASE_DN_ANCESTOR_EXISTS.get(
                    baseDN.getDn().toString()));
                errors.add(ERR_BASE_DN_ANCESTOR_EXISTS.get(baseDN.getDn()));
                setPrimaryInvalid(lDirectoryBaseDN);
                baseDNAlreadyDefined = true;
                break;
@@ -568,8 +567,7 @@
            {
              if (backendName.equalsIgnoreCase(backend.getBackendID()))
              {
                errors.add(ERR_BASE_DN_DN_IS_ANCESTOR_OF.get(
                    baseDN.getDn().toString()));
                errors.add(ERR_BASE_DN_DN_IS_ANCESTOR_OF.get(baseDN.getDn()));
                setPrimaryInvalid(lDirectoryBaseDN);
                baseDNAlreadyDefined = true;
                break;
@@ -584,8 +582,7 @@
      }
      catch (OpenDsException oe)
      {
        errors.add(INFO_CTRL_PANEL_INVALID_DN_DETAILS.get(dn,
            oe.getMessageObject().toString()));
        errors.add(INFO_CTRL_PANEL_INVALID_DN_DETAILS.get(dn, oe.getMessageObject()));
        setPrimaryInvalid(lDirectoryBaseDN);
      }
    }

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

@@ -239,8 +239,7 @@
          catch (OpenDsException ode)
          {
            errorFound = true;
            errors.add(ERR_CTRL_PANEL_MEMBER_VALUE_NOT_VALID.get(member,
                ode.getMessageObject().toString()));
            errors.add(ERR_CTRL_PANEL_MEMBER_VALUE_NOT_VALID.get(member, ode.getMessageObject()));
          }
        }
      }
@@ -278,8 +277,7 @@
        }
        catch (OpenDsException ode)
        {
          errors.add(ERR_CTRL_PANEL_GROUP_FILTER_NOT_VALID.get(
              ode.getMessageObject().toString()));
          errors.add(ERR_CTRL_PANEL_GROUP_FILTER_NOT_VALID.get(ode.getMessageObject()));
        }
      }
      if (errorFound)
@@ -309,8 +307,7 @@
      catch (OpenDsException ode)
      {
        errorFound = true;
        errors.add(ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_VALID.get(
            ode.getMessageObject().toString()));
        errors.add(ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_VALID.get(ode.getMessageObject()));
      }
      if (errorFound)
      {

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

@@ -266,8 +266,7 @@
      LocalizableMessage elementType = NewAttributePanel.getSchemaElementType(n, schema);
      if (elementType != null)
      {
        errors.add(ERR_CTRL_PANEL_OBJECTCLASS_NAME_ALREADY_IN_USE.get(n,
            elementType.toString()));
        errors.add(ERR_CTRL_PANEL_OBJECTCLASS_NAME_ALREADY_IN_USE.get(n, elementType));
      }
    }

@@ -284,8 +283,7 @@
        LocalizableMessage elementType = NewAttributePanel.getSchemaElementType(n, schema);
        if (elementType != null)
        {
          errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n,
              elementType.toString()));
          errors.add(ERR_CTRL_PANEL_OID_ALREADY_IN_USE.get(n, elementType));
        }
      }
    }
@@ -307,8 +305,7 @@
                alias, schema);
            if (elementType != null)
            {
              errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n,
                  elementType.toString()));
              errors.add(ERR_CTRL_PANEL_ALIAS_ALREADY_IN_USE.get(n, elementType));
            }
          }
        }

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

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

      errorPane.setVisible(true);
      errorPane.setText(Utilities.applyFont(
              INFO_CTRL_PANEL_PLEASE_WAIT_SUMMARY.get().toString(),
              INFO_CTRL_PANEL_PLEASE_WAIT_SUMMARY.get(),
              ColorAndFontConstants.defaultFont));

      gbc.anchor = GridBagConstraints.WEST;

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

@@ -2214,8 +2214,7 @@
   */
  protected static LocalizableMessage getLabel(MonitoringAttributes attr)
  {
    return INFO_CTRL_PANEL_OPERATION_NAME_AS_LABEL.get(
        attr.getMessage().toString());
    return INFO_CTRL_PANEL_OPERATION_NAME_AS_LABEL.get(attr.getMessage());
  }

  /**

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

@@ -405,8 +405,7 @@
      // is 2nd (or 1st depending of the year) of Mars.
      if (calendar.get(Calendar.MONTH) != m)
      {
        errorMessages.add(ERR_CTRL_PANEL_INVALID_DAY_IN_MONTH.get(d,
            month.getSelectedItem().toString()));
        errorMessages.add(ERR_CTRL_PANEL_INVALID_DAY_IN_MONTH.get(d, month.getSelectedItem()));
        setPrimaryInvalid(lDay);
        setPrimaryInvalid(lMonth);
      }
@@ -1127,7 +1126,7 @@
    GridBagConstraints gbc = new GridBagConstraints();

    JEditorPane explanation = Utilities.makeHtmlPane(
        INFO_CTRL_PANEL_CRON_HELP.get().toString(),
        INFO_CTRL_PANEL_CRON_HELP.get(),
        ColorAndFontConstants.inlineHelpFont);
    gbc.gridx = 0;
    gbc.gridy = 0;

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

@@ -193,8 +193,7 @@
    }
    else
    {
      returnValue = INFO_CTRL_PANEL_CONTENTS_OF_FILE.get(
          value.getFile().toString());
      returnValue = INFO_CTRL_PANEL_CONTENTS_OF_FILE.get(value.getFile());
    }
    return returnValue;
  }

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

@@ -198,9 +198,7 @@
              if (parentDN == null)
              {
                LocalizableMessage message = ERR_CONFIG_FILE_UNKNOWN_PARENT.get(
                    entryDN.toString(),
                    reader.getLastEntryLineNumber(),
                    f.getAbsolutePath());
                    entryDN, reader.getLastEntryLineNumber(), f.getAbsolutePath());
                throw new InitializationException(message);
              }
              else

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

@@ -344,7 +344,7 @@
   * @param font the font to be used in the message.
   * @return a JEditorPane that displays a message.
   */
  public static JEditorPane makeHtmlPane(String text, Font font)
  public static JEditorPane makeHtmlPane(CharSequence text, Font font)
  {
    JEditorPane pane = new JEditorPane();
    pane.setContentType("text/html");
@@ -958,7 +958,7 @@
   * @return a string that represents the original HTML with the font specified
   * as parameter.
   */
  public static String applyFont(String html, Font font)
  public static String applyFont(CharSequence html, Font font)
  {
    StringBuilder buf = new StringBuilder();

@@ -1658,7 +1658,7 @@
   */
  public static String getProgressDone(Font progressFont)
  {
    return applyFont(INFO_CTRL_PANEL_PROGRESS_DONE.get().toString(),
    return applyFont(INFO_CTRL_PANEL_PROGRESS_DONE.get(),
        progressFont.deriveFont(Font.BOLD));
  }

@@ -1798,9 +1798,7 @@
  {
    l.setText(INFO_CTRL_PANEL_NOT_AVAILABLE_LONG_LABEL.get().toString());
    l.setHelpIconVisible(true);
    l.setHelpTooltip(
            INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_TOOLTIP.get()
                    .toString());
    l.setHelpTooltip(INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_TOOLTIP.get().toString());
  }

  /**
@@ -1828,9 +1826,7 @@
  {
    l.setText(INFO_CTRL_PANEL_NOT_AVAILABLE_LONG_LABEL.get().toString());
    l.setHelpIconVisible(true);
    l.setHelpTooltip(
            INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_TOOLTIP.get()
                    .toString());
    l.setHelpTooltip(INFO_NOT_AVAILABLE_AUTHENTICATION_REQUIRED_TOOLTIP.get().toString());
  }

  /**

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

@@ -1395,7 +1395,7 @@
          returnValue = askConfirmation(
            ERR_UNINSTALL_READING_REGISTERED_SERVERS_CONFIRM_UPDATE_REMOTE.get(
                Utils.getMessageFromCollection(exceptionMsgs,
                  Constants.LINE_SEPARATOR).toString()), true, logger);
                  Constants.LINE_SEPARATOR)), true, logger);
        }
        catch (CLIException ce)
        {
@@ -1434,7 +1434,7 @@
              "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
              "--"+parser.forceOnErrorArg.getLongIdentifier(),
              Utils.getMessageFromCollection(exceptionMsgs,
                  Constants.LINE_SEPARATOR).toString());
                  Constants.LINE_SEPARATOR));
          throw new ApplicationException(ReturnCode.APPLICATION_ERROR, msg,
              null);
        }

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

@@ -1784,7 +1784,7 @@
    {
      LocalizableMessage confirmationMsg =
        ERR_UNINSTALL_READING_REGISTERED_SERVERS_CONFIRM_UPDATE_REMOTE.get(
                getMessageFromCollection(exceptionMsgs, "\n").toString());
                getMessageFromCollection(exceptionMsgs, "\n"));
      stopProcessing = !qs.displayConfirmation(confirmationMsg,
          INFO_CONFIRMATION_TITLE.get());
    }
@@ -2040,7 +2040,7 @@
              "--"+ToolConstants.OPTION_LONG_BINDPWD,
              "--"+ToolConstants.OPTION_LONG_BINDPWD_FILE,
              "--"+parser.forceOnErrorArg.getLongIdentifier(),
              ae.getMessageObject().toString());
              ae.getMessageObject());
          throw new ApplicationException(ae.getType(), msg, ae);
        }
        else
@@ -2178,10 +2178,9 @@
          "Error removing references in replication server on "+
          serverDisplay+": "+t, t));
      LocalizableMessage errorMessage = INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(
              serverDisplay, t.toString());
              serverDisplay, t);
      throw new ApplicationException(
          ReturnCode.CONFIGURATION_ERROR, errorMessage,
          t);
          ReturnCode.CONFIGURATION_ERROR, errorMessage, t);
    }
    ADSContext adsContext = new ADSContext(ctx);

@@ -2202,8 +2201,8 @@
      {
        throw new ApplicationException(
            ReturnCode.CONFIGURATION_ERROR,
            INFO_REMOTE_ADS_EXCEPTION.get(
                    serverDisplay, ace.toString()), ace);
            INFO_REMOTE_ADS_EXCEPTION.get(serverDisplay, ace),
            ace);
      }
      else
      {

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

@@ -2976,7 +2976,7 @@
    adminProperties.put(ADSContext.AdministratorProperty.PASSWORD,
        userData.getGlobalAdministratorPassword());
    adminProperties.put(ADSContext.AdministratorProperty.DESCRIPTION,
        INFO_GLOBAL_ADMINISTRATOR_DESCRIPTION.get().toString());
        INFO_GLOBAL_ADMINISTRATOR_DESCRIPTION.get());
    return adminProperties;
  }

@@ -3677,8 +3677,7 @@
          qs.displayFieldInvalid(FieldName.REMOTE_SERVER_PORT, true);
          qs.displayFieldInvalid(FieldName.REMOTE_SERVER_DN, true);
          qs.displayFieldInvalid(FieldName.REMOTE_SERVER_PWD, true);
          errorMsgs.add(INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC.get(
                  host+":"+port, t.toString()));
          errorMsgs.add(INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC.get(host+":"+port, t));
        }
      }
      else if (t instanceof NamingException)
@@ -3695,8 +3694,7 @@
      }
      else if (t instanceof ADSContextException)
      {
        errorMsgs.add(INFO_REMOTE_ADS_EXCEPTION.get(
                host+":"+port, t.toString()));
        errorMsgs.add(INFO_REMOTE_ADS_EXCEPTION.get(host+":"+port, t));
      }
      else
      {

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

@@ -329,10 +329,9 @@
    }
    catch (Throwable t)
    {
      LocalizableMessage errorMessage = INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(
              serverDisplay, t.toString());
      throw new ApplicationException(
          ReturnCode.CONFIGURATION_ERROR, errorMessage,
          ReturnCode.CONFIGURATION_ERROR,
          INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(serverDisplay, t),
          t);
    }
  }
@@ -396,10 +395,9 @@
    }
    catch (Throwable t)
    {
      LocalizableMessage errorMessage = INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(
              serverDisplay, t.toString());
      throw new ApplicationException(
          ReturnCode.CONFIGURATION_ERROR, errorMessage,
          ReturnCode.CONFIGURATION_ERROR,
          INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(serverDisplay, t),
          t);
    }
  }
@@ -435,10 +433,9 @@
    }
    catch (Throwable t)
    {
      LocalizableMessage errorMessage = INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(
              serverDisplay, t.toString());
      throw new ApplicationException(
          ReturnCode.CONFIGURATION_ERROR, errorMessage,
          ReturnCode.CONFIGURATION_ERROR,
          INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(serverDisplay, t),
          t);
    }
  }
@@ -651,10 +648,9 @@
    }
    catch (Throwable t)
    {
      LocalizableMessage errorMessage = INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(
              serverDisplay, t.toString());
      throw new ApplicationException(
          ReturnCode.CONFIGURATION_ERROR, errorMessage,
          ReturnCode.CONFIGURATION_ERROR,
          INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(serverDisplay, t),
          t);
    }
  }
@@ -764,10 +760,9 @@
    }
    catch (Throwable t)
    {
      LocalizableMessage errorMessage = INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(
              serverDisplay, t.toString());
      throw new ApplicationException(
          ReturnCode.CONFIGURATION_ERROR, errorMessage,
          ReturnCode.CONFIGURATION_ERROR,
          INFO_ERROR_CONFIGURING_REMOTE_GENERIC.get(serverDisplay, t),
          t);
    }
  }

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

@@ -156,8 +156,7 @@
        }

        final LocalizableMessage message = ERR_PWPSTATE_CANNOT_DECODE_BOOLEAN
            .get(valueString, attributeType.getNameOrOID(), entry.getName()
                .toString());
            .get(valueString, attributeType.getNameOrOID(), entry.getName());
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
            message);
      }

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

@@ -265,11 +265,8 @@
          if(dn == DN.rootDN()) {
            msgDN=configDN;
          }
          LocalizableMessage message = WARN_ACI_ADD_LIST_FAILED_DECODE.get(
                  value.getValue().toString(),
                  String.valueOf(msgDN),
                  ex.getMessage());
          failedACIMsgs.add(message);
          failedACIMsgs.add(WARN_ACI_ADD_LIST_FAILED_DECODE.get(
              value.getValue(), msgDN, ex.getMessage()));
        }
      }
    }

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

@@ -519,9 +519,7 @@
                break;
            }
            default:  {
                LocalizableMessage message = WARN_ACI_SYNTAX_INVALID_BIND_RULE_KEYWORD.get(
                    keyword.toString());
                throw new AciException(message);
                throw new AciException(WARN_ACI_SYNTAX_INVALID_BIND_RULE_KEYWORD.get(keyword));
            }
        }
        return rule;

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

@@ -423,10 +423,8 @@
      }
      else
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(
            dnString, attributeName.toString(), c);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(dnString, attributeName, c));
      }

      // Skip over any spaces after the equal sign.
@@ -518,10 +516,8 @@
        // because that would be invalid.
        if (pos >= length)
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(
              dnString, attributeName.toString());
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, attributeName));
        }


@@ -1060,17 +1056,13 @@
        validOID = false;
      }


      if (! validOID)
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_PERIOD.get(
            dnString, attributeName.toString());
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_PERIOD.get(dnString, attributeName));
      }
    }


    return pos;
  }


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

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

      LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
          backupBaseDN.toString(), getExceptionMessage(e));
          backupBaseDN, getExceptionMessage(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -122,9 +122,7 @@
    // map.
    if (baseDNs == null || baseDNs.length != 1)
    {
      LocalizableMessage message = ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(
                             currentConfig.dn().toString());
      throw new ConfigException(message);
      throw new ConfigException(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(currentConfig.dn()));
    }

    for (DN dn : baseDNs)
@@ -139,7 +137,7 @@
        logger.traceException(e);

        LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
            dn.toString(), getExceptionMessage(e));
            dn, getExceptionMessage(e));
        throw new InitializationException(message, e);
      }
    }
@@ -220,7 +218,7 @@

      LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_CREATING_FILE.get(
                       tempFile.getAbsolutePath(),
                       currentConfig.dn().toString(),
                       currentConfig.dn(),
                       stackTraceToSingleLineString(e));
      DirectoryServer.sendAlertNotification(this,
                           ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
@@ -243,7 +241,7 @@

        LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_WRITING_FILE.get(
                         tempFile.getAbsolutePath(),
                         currentConfig.dn().toString(),
                         currentConfig.dn(),
                         stackTraceToSingleLineString(e));
        DirectoryServer.sendAlertNotification(this,
                             ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
@@ -292,7 +290,7 @@
      LocalizableMessage m = ERR_LDIF_BACKEND_ERROR_RENAMING_FILE.get(
                       tempFile.getAbsolutePath(),
                       ldifFile.getAbsolutePath(),
                       currentConfig.dn().toString(),
                       currentConfig.dn(),
                       stackTraceToSingleLineString(e));
      DirectoryServer.sendAlertNotification(this,
                           ALERT_TYPE_LDIF_BACKEND_CANNOT_WRITE_UPDATE, m);
@@ -783,16 +781,13 @@
          parentDN = parentDN.getParentDNInSuffix();
        }

        LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_NO_SUCH_SOURCE_ENTRY.get(
                         currentDN.toString());
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN,
                                     null);
        LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_NO_SUCH_SOURCE_ENTRY.get(currentDN);
        throw new DirectoryException(ResultCode.NO_SUCH_OBJECT, m, matchedDN, null);
      }

      if (entryMap.containsKey(newDN))
      {
        LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_TARGET_ENTRY_ALREADY_EXISTS.get(
                         newDN.toString());
        LocalizableMessage m = ERR_LDIF_BACKEND_MODDN_TARGET_ENTRY_ALREADY_EXISTS.get(newDN);
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, m);
      }

@@ -1140,8 +1135,8 @@
          DN entryDN = e.getName();
          if (entryMap.containsKey(entryDN))
          {
            LocalizableMessage m = ERR_LDIF_BACKEND_DUPLICATE_ENTRY.get(ldifFilePath,
                             currentConfig.dn().toString(), entryDN.toString());
            LocalizableMessage m =
                ERR_LDIF_BACKEND_DUPLICATE_ENTRY.get(ldifFilePath, currentConfig.dn(), entryDN);
            logger.error(m);
            reader.rejectLastEntry(m);
            continue;
@@ -1169,8 +1164,8 @@

          if (! isBelowBaseDN)
          {
            LocalizableMessage m = ERR_LDIF_BACKEND_ENTRY_OUT_OF_SCOPE.get(ldifFilePath,
                             currentConfig.dn().toString(), entryDN.toString());
            LocalizableMessage m = ERR_LDIF_BACKEND_ENTRY_OUT_OF_SCOPE.get(
                ldifFilePath, currentConfig.dn(), entryDN);
            logger.error(m);
            reader.rejectLastEntry(m);
            continue;
@@ -1179,8 +1174,8 @@
          DN parentDN = entryDN.getParentDNInSuffix();
          if (parentDN == null || !entryMap.containsKey(parentDN))
          {
            LocalizableMessage m = ERR_LDIF_BACKEND_MISSING_PARENT.get(ldifFilePath,
                             currentConfig.dn().toString(), entryDN.toString());
            LocalizableMessage m = ERR_LDIF_BACKEND_MISSING_PARENT.get(
                ldifFilePath, currentConfig.dn(), entryDN);
            logger.error(m);
            reader.rejectLastEntry(m);
            continue;
@@ -1314,8 +1309,7 @@
      currentConfig.getBaseDN().toArray(baseDNs);
      if (baseDNs.length != 1)
      {
        throw new ConfigException(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(
                                       currentConfig.dn().toString()));
        throw new ConfigException(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(currentConfig.dn()));
      }

      baseDNSet = new HashSet<DN>();
@@ -1342,8 +1336,7 @@
    // Make sure that there is only a single base DN.
    if (configuration.getBaseDN().size() != 1)
    {
      unacceptableReasons.add(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(
                                   configuration.dn().toString()));
      unacceptableReasons.add(ERR_LDIF_BACKEND_MULTIPLE_BASE_DNS.get(configuration.dn()));
      configAcceptable = false;
    }


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

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

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

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

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

      final LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
          baseMonitorDN.toString(), getExceptionMessage(e));
          baseMonitorDN, getExceptionMessage(e));
      throw new InitializationException(message, e);
    }
  }

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

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

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

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

@@ -1598,26 +1598,18 @@
      }
      else
      {
        StringBuilder basesStr = new StringBuilder();
        StringBuilder basesStr = new StringBuilder("{ ");
        for (DN dn : subordinateBaseDNs.keySet())
        {
          if (basesStr.length() > 0)
          {
            basesStr.append(", ");
          }
          else
          {
            basesStr.append("{ ");
          }

          basesStr.append(dn);
        }

        basesStr.append(" }");

        LocalizableMessage message = INFO_ROOTDSE_USING_NEW_SUBORDINATE_BASE_DNS.get(
                basesStr.toString());
        messages.add(message);
        messages.add(INFO_ROOTDSE_USING_NEW_SUBORDINATE_BASE_DNS.get(basesStr));
      }



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

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

        LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
            baseDN.toString(), getExceptionMessage(e));
            baseDN, getExceptionMessage(e));
        throw new InitializationException(message, e);
      }
    }
@@ -1155,7 +1155,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1201,7 +1201,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1224,7 +1224,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DCR.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1247,7 +1247,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DSR.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1270,7 +1270,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_MR_USE.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1294,7 +1294,7 @@

                LocalizableMessage message =
                    ERR_SCHEMA_MODIFY_CANNOT_DECODE_LDAP_SYNTAX.get(
                        v.getValue().toString(), de.getMessageObject());
                        v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1336,7 +1336,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1383,7 +1383,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1406,7 +1406,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DCR.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1430,7 +1430,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DSR.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1454,7 +1454,7 @@
                logger.traceException(de);

                LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_MR_USE.get(
                    v.getValue().toString(), de.getMessageObject());
                    v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1479,7 +1479,7 @@

                LocalizableMessage message =
                    ERR_SCHEMA_MODIFY_CANNOT_DECODE_LDAP_SYNTAX.get(
                        v.getValue().toString(), de.getMessageObject());
                        v.getValue(), de.getMessageObject());
                throw new DirectoryException(
                    ResultCode.INVALID_ATTRIBUTE_SYNTAX, message, de);
              }
@@ -1838,7 +1838,7 @@
          logger.traceException(de);

          LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_ATTRTYPE.get(
              v.getValue().toString(), de.getMessageObject());
              v.getValue(), de.getMessageObject());
          throw new DirectoryException(
                         ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
                         de);
@@ -2165,7 +2165,7 @@
          logger.traceException(de);

          LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_OBJECTCLASS.get(
              v.getValue().toString(), de.getMessageObject());
              v.getValue(), de.getMessageObject());
          throw new DirectoryException(
                         ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
                         de);
@@ -2210,7 +2210,7 @@
        buffer.append("\t");
      }
      LocalizableMessage message = ERR_SCHEMA_MODIFY_REMOVE_OC_IN_NF.get(
          removeClass.getNameOrOID(), buffer.toString());
          removeClass.getNameOrOID(), buffer);
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
    }

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

          LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_NAME_FORM.get(
              v.getValue().toString(), de.getMessageObject());
              v.getValue(), de.getMessageObject());
          throw new DirectoryException(
                         ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
                         de);
@@ -3010,7 +3010,7 @@
          logger.traceException(de);

          LocalizableMessage message = ERR_SCHEMA_MODIFY_CANNOT_DECODE_DSR.get(
              v.getValue().toString(), de.getMessageObject());
              v.getValue(), de.getMessageObject());
          throw new DirectoryException(
                         ResultCode.INVALID_ATTRIBUTE_SYNTAX, message,
                         de);

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

@@ -1647,8 +1647,7 @@
        parentID = dn2id.get(txn, parentDN, LockMode.DEFAULT);
        if (parentID == null)
        {
          LocalizableMessage message = ERR_JEB_ADD_NO_SUCH_OBJECT.get(
              entry.getName().toString());
          LocalizableMessage message = ERR_JEB_ADD_NO_SUCH_OBJECT.get(entry.getName());
          DN matchedDN = getMatchedDN(baseDN);
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
              message, matchedDN, null);
@@ -2367,10 +2366,8 @@
      if (!currentDN.equals(entry.getName()) &&
          dn2id.get(txn, entry.getName(), LockMode.DEFAULT) != null)
      {
        LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
            entry.getName().toString());
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
            message);
        LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(entry.getName());
        throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
      }

      EntryID oldApexID = dn2id.get(txn, currentDN, LockMode.DEFAULT);
@@ -2409,9 +2406,7 @@
        EntryID newSuperiorID = dn2id.get(txn, newSuperiorDN, LockMode.DEFAULT);
        if (newSuperiorID == null)
        {
          LocalizableMessage msg =
            ERR_JEB_NEW_SUPERIOR_NO_SUCH_OBJECT.get(
                newSuperiorDN.toString());
          LocalizableMessage msg = ERR_JEB_NEW_SUPERIOR_NO_SUCH_OBJECT.get(newSuperiorDN);
          DN matchedDN = getMatchedDN(baseDN);
          throw new DirectoryException(ResultCode.NO_SUCH_OBJECT,
              msg, matchedDN, null);
@@ -2627,10 +2622,8 @@
  {
    if (!dn2id.insert(txn, newEntry.getName(), newID))
    {
      LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(
          newEntry.getName().toString());
      throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS,
                                   message);
      LocalizableMessage message = ERR_JEB_MODIFYDN_ALREADY_EXISTS.get(newEntry.getName());
      throw new DirectoryException(ResultCode.ENTRY_ALREADY_EXISTS, message);
    }
    id2entry.put(txn, newID, newEntry);
    dn2uri.addEntry(txn, newEntry);
@@ -2769,10 +2762,8 @@

      if (!pluginResult.continueProcessing())
      {
        LocalizableMessage message = ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_PLUGIN.get(
            oldDN.toString(), newDN.toString());
        throw new DirectoryException(
            DirectoryServer.getServerErrorResultCode(), message);
        throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
            ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_PLUGIN.get(oldDN, newDN));
      }

      if (! modifications.isEmpty())
@@ -2782,10 +2773,7 @@
            invalidReason))
        {
          LocalizableMessage message =
            ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_SCHEMA_ERROR.get(
                oldDN.toString(),
                newDN.toString(),
                invalidReason.toString());
            ERR_JEB_MODIFYDN_ABORTED_BY_SUBORDINATE_SCHEMA_ERROR.get(oldDN, newDN, invalidReason);
          throw new DirectoryException(
              DirectoryServer.getServerErrorResultCode(), message);
        }

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

@@ -357,10 +357,8 @@
        }
        else
        {
          final LocalizableMessage m = ERR_JEB_COMPSCHEMA_CANNOT_STORE_STATUS.get(status
              .toString());
          throw new DirectoryException(
              DirectoryServer.getServerErrorResultCode(), m);
          final LocalizableMessage m = ERR_JEB_COMPSCHEMA_CANNOT_STORE_STATUS.get(status);
          throw new DirectoryException(DirectoryServer.getServerErrorResultCode(), m);
        }
      }
      catch (final LockConflictException ce)

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

@@ -287,9 +287,8 @@
    // another to be opened.
    if (ec1 != null)
    {
      LocalizableMessage m = ERR_JEB_ENTRY_CONTAINER_ALREADY_REGISTERED.get(
        ec1.getDatabasePrefix(), baseDN.toString());
      throw new InitializationException(m);
      throw new InitializationException(ERR_JEB_ENTRY_CONTAINER_ALREADY_REGISTERED.get(
          ec1.getDatabasePrefix(), baseDN));
    }

    this.entryContainers.put(baseDN, entryContainer);
@@ -744,7 +743,6 @@
  @Override
  public ConfigChangeResult applyConfigurationChange(LocalDBBackendCfg cfg)
  {
    ConfigChangeResult ccr;
    boolean adminActionRequired = false;
    ArrayList<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();

@@ -834,25 +832,21 @@
        {
          if(!backendDirectory.mkdirs())
          {
            messages.add(ERR_JEB_CREATE_FAIL.get(
                backendDirectory.getPath()));
            ccr = new ConfigChangeResult(
            messages.add(ERR_JEB_CREATE_FAIL.get(backendDirectory.getPath()));
            return new ConfigChangeResult(
                DirectoryServer.getServerErrorResultCode(),
                adminActionRequired,
                messages);
            return ccr;
          }
        }
        //Make sure the directory is valid.
        else if (!backendDirectory.isDirectory())
        {
          messages.add(ERR_JEB_DIRECTORY_INVALID.get(
              backendDirectory.getPath()));
          ccr = new ConfigChangeResult(
          messages.add(ERR_JEB_DIRECTORY_INVALID.get(backendDirectory.getPath()));
          return new ConfigChangeResult(
              DirectoryServer.getServerErrorResultCode(),
              adminActionRequired,
              messages);
          return ccr;
        }

        adminActionRequired = true;
@@ -872,13 +866,11 @@
        }
        catch(Exception e)
        {
          messages.add(ERR_CONFIG_BACKEND_MODE_INVALID.get(
              config.dn().toString()));
          ccr = new ConfigChangeResult(
          messages.add(ERR_CONFIG_BACKEND_MODE_INVALID.get(config.dn()));
          return new ConfigChangeResult(
              DirectoryServer.getServerErrorResultCode(),
              adminActionRequired,
              messages);
          return ccr;
        }

        //Make sure the mode will allow the server itself access to
@@ -889,11 +881,10 @@
        {
          messages.add(ERR_CONFIG_BACKEND_INSANE_MODE.get(
              cfg.getDBDirectoryPermissions()));
          ccr = new ConfigChangeResult(
          return new ConfigChangeResult(
              DirectoryServer.getServerErrorResultCode(),
              adminActionRequired,
              messages);
          return ccr;
        }

        // Get the backend database backendDirectory permissions and apply
@@ -928,16 +919,12 @@
    catch (Exception e)
    {
      messages.add(LocalizableMessage.raw(stackTraceToSingleLineString(e)));
      ccr = new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
      return new ConfigChangeResult(DirectoryServer.getServerErrorResultCode(),
                                   adminActionRequired,
                                   messages);
      return ccr;
    }


    ccr = new ConfigChangeResult(ResultCode.SUCCESS, adminActionRequired,
                                 messages);
    return ccr;
    return new ConfigChangeResult(ResultCode.SUCCESS, adminActionRequired, messages);
  }

  /**

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

@@ -3178,10 +3178,8 @@
      suffix = Suffix.createSuffixContext(entryContainer, null, null, null);
      if (suffix == null)
      {
        LocalizableMessage msg =
            ERR_JEB_REBUILD_SUFFIX_ERROR.get(rebuildConfig.getBaseDN()
                .toString());
        throw new InitializationException(msg);
        throw new InitializationException(
            ERR_JEB_REBUILD_SUFFIX_ERROR.get(rebuildConfig.getBaseDN()));
      }
    }


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

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

      LocalizableMessage message = ERR_BACKEND_CANNOT_REGISTER_BASEDN.get(
          taskRootDN.toString(), getExceptionMessage(e));
          taskRootDN, getExceptionMessage(e));
      throw new InitializationException(message, e);
    }
  }

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

@@ -448,9 +448,8 @@

    if (! valueIsAcceptable(value, rejectReason))
    {
      LocalizableMessage message = ERR_CONFIG_ATTR_REJECTED_VALUE.get(
          value.getValue().toString(), name, rejectReason.toString());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ATTR_REJECTED_VALUE.get(
          value.getValue(), name, rejectReason));
    }


@@ -469,9 +468,8 @@
      value = iterator.next();
      if (! valueIsAcceptable(value, rejectReason))
      {
        LocalizableMessage message = ERR_CONFIG_ATTR_REJECTED_VALUE.get(
            value.getValue().toString(), name, rejectReason.toString());
        throw new ConfigException(message);
        throw new ConfigException(ERR_CONFIG_ATTR_REJECTED_VALUE.get(
            value.getValue(), name, rejectReason));
      }
    }

@@ -588,16 +586,14 @@
    {
      if (tempValues.contains(value))
      {
        LocalizableMessage message = ERR_CONFIG_ATTR_ADD_VALUES_ALREADY_EXISTS.get(
            name, value.getValue().toString());
        throw new ConfigException(message);
        throw new ConfigException(ERR_CONFIG_ATTR_ADD_VALUES_ALREADY_EXISTS.get(
            name, value.getValue()));
      }

      if (! valueIsAcceptable(value, rejectReason))
      {
        LocalizableMessage message = ERR_CONFIG_ATTR_REJECTED_VALUE.get(
            value.getValue().toString(), name, rejectReason.toString());
        throw new ConfigException(message);
        throw new ConfigException(ERR_CONFIG_ATTR_REJECTED_VALUE.get(
            value.getValue(), name, rejectReason));
      }
    }


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

@@ -345,9 +345,8 @@

    if (conflictingChild != null)
    {
      LocalizableMessage message = ERR_CONFIG_ENTRY_CONFLICTING_CHILD.get(
          conflictingChild.getDN().toString(), entry.getName().toString());
      throw new ConfigException(message);
      throw new ConfigException(ERR_CONFIG_ENTRY_CONFLICTING_CHILD.get(
          conflictingChild.getDN(), entry.getName()));
    }
  }

@@ -377,16 +376,14 @@
        ConfigEntry childEntry = children.get(childDN);
        if (childEntry == null)
        {
          LocalizableMessage message = ERR_CONFIG_ENTRY_NO_SUCH_CHILD.get(
              childDN.toString(), entry.getName().toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_CONFIG_ENTRY_NO_SUCH_CHILD.get(
              childDN, entry.getName()));
        }

        if (childEntry.hasChildren())
        {
          LocalizableMessage message = ERR_CONFIG_ENTRY_CANNOT_REMOVE_NONLEAF.get(
              childDN.toString(), entry.getName().toString());
          throw new ConfigException(message);
          throw new ConfigException(ERR_CONFIG_ENTRY_CANNOT_REMOVE_NONLEAF.get(
              childDN, entry.getName()));
        }

        children.remove(childDN);

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

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

      rejectReason.append(ERR_CONFIG_ATTR_DN_CANNOT_PARSE.get(
              value.getValue().toString(), getName(),
              String.valueOf(e)));
              value.getValue(), getName(), e));
      return false;
    }

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

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

@@ -845,9 +844,8 @@
        {
          // This is illegal -- only the pending option is allowed for
          // configuration attributes.
          LocalizableMessage message =
              ERR_CONFIG_ATTR_OPTIONS_NOT_ALLOWED.get(a.getName());
          throw new ConfigException(message);
          throw new ConfigException(
              ERR_CONFIG_ATTR_OPTIONS_NOT_ALLOWED.get(a.getName()));
        }
      }
      else
@@ -856,9 +854,8 @@
        if (activeValues!= null)
        {
          // We cannot have multiple active value sets.
          LocalizableMessage message =
              ERR_CONFIG_ATTR_MULTIPLE_ACTIVE_VALUE_SETS.get(a.getName());
          throw new ConfigException(message);
          throw new ConfigException(
              ERR_CONFIG_ATTR_MULTIPLE_ACTIVE_VALUE_SETS.get(a.getName()));
        }


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

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


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

@@ -1092,7 +1092,7 @@
              catch (Exception e)
              {
                LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
                    v.getValue().toString(), a.getName(), String.valueOf(e));
                    v.getValue(), a.getName(), e);
                throw new ConfigException(message, e);
              }

@@ -1174,7 +1174,7 @@
            catch (Exception e)
            {
              LocalizableMessage message = ERR_CONFIG_ATTR_INT_COULD_NOT_PARSE.get(
                  v.getValue().toString(), a.getName(), String.valueOf(e));
                  v.getValue(), a.getName(), e);
              throw new ConfigException(message, e);
            }


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

@@ -804,9 +804,7 @@
      if (! valueIsAcceptable(valueString.toLowerCase(), rejectReason))
      {
        LocalizableMessage message = ERR_CONFIG_ATTR_INVALID_VALUE_WITH_UNIT.get(
                valueString, getName(),
                rejectReason.toString());

                valueString, getName(), rejectReason);
        if (allowFailures)
        {
          logger.error(message);

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

@@ -758,11 +758,9 @@

    buffer.append(")");

    LocalizableMessage message = ERR_CONFIG_JMX_NO_METHOD.get(
        buffer.toString(), configEntryDN.toString());
    LocalizableMessage message = ERR_CONFIG_JMX_NO_METHOD.get(buffer, configEntryDN);
    throw new MBeanException(
                   new DirectoryException(ResultCode.NO_SUCH_OPERATION,
                                          message));
        new DirectoryException(ResultCode.NO_SUCH_OPERATION, message));
  }



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

@@ -856,9 +856,8 @@
              if (! allowedValues.contains(lowerValue))
              {
                // This is illegal -- the value is not allowed.
                LocalizableMessage message = ERR_CONFIG_ATTR_VALUE_NOT_ALLOWED.get(
                    v.getValue().toString(), a.getName());
                throw new ConfigException(message);
                throw new ConfigException(ERR_CONFIG_ATTR_VALUE_NOT_ALLOWED.get(
                    v.getValue(), a.getName()));
              }

              pendingValues.add(v.getValue().toString());
@@ -918,9 +917,8 @@
            if (! allowedValues.contains(lowerValue))
            {
              // This is illegal -- the value is not allowed.
              LocalizableMessage message = ERR_CONFIG_ATTR_VALUE_NOT_ALLOWED.get(
                  v.getValue().toString(), a.getName());
              throw new ConfigException(message);
              throw new ConfigException(ERR_CONFIG_ATTR_VALUE_NOT_ALLOWED.get(
                  v.getValue(), a.getName()));
            }

            activeValues.add(v.getValue().toString());

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

@@ -91,7 +91,7 @@
          LocalizableMessage message =
            ERR_CANNOT_DECODE_CONTROL_VALUE.get(
                getOID() + " x=" + value.toHexString() + " v="
                + mdssValue , getExceptionMessage(e).toString());
                + mdssValue , getExceptionMessage(e));
          throw new DirectoryException(ResultCode.PROTOCOL_ERROR, message, e);
        }
      }

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

@@ -476,13 +476,9 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_AUTHZ_CONFIG_NOT_ACCEPTABLE.get(
            // Bug: where in a section where configuration is null
            // WAS: String.valueOf( configuration.dn())
            // Now:
                  "null"
                  , buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(ERR_CONFIG_AUTHZ_CONFIG_NOT_ACCEPTABLE.get(
                  null /* WAS: configuration.dn() */, buffer));
        }
      }

@@ -491,8 +487,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_AUTHZ_UNABLE_TO_INSTANTIATE_HANDLER.
          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/AccountStatusNotificationHandlerConfigManager.java

@@ -463,9 +463,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_ACCTNOTHANDLER_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_ACCTNOTHANDLER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }

@@ -474,9 +473,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_ACCTNOTHANDLER_INITIALIZATION_FAILED.get(
              className,
              String.valueOf(configuration.dn()),
              stackTraceToSingleLineString(e));
              className, configuration.dn(), stackTraceToSingleLineString(e));
      throw new InitializationException(message, e);
    }
  }
@@ -485,7 +482,7 @@
  /**
   * Remove a notification handler that has been installed in the server.
   *
   * @param configEntryDN  the DN of the configuration enry associated to
   * @param configEntryDN  the DN of the configuration entry associated to
   *                       the notification handler to remove
   */
  private void uninstallNotificationHandler(

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

@@ -414,9 +414,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_ALERTHANDLER_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_ALERTHANDLER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -498,9 +498,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_SCHEMA_SYNTAX_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_SCHEMA_SYNTAX_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }

@@ -509,8 +508,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_SCHEMA_SYNTAX_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/CertificateMapperConfigManager.java

@@ -430,9 +430,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_CERTMAPPER_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_CERTMAPPER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }

@@ -445,8 +444,7 @@
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_CERTMAPPER_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/DirectoryServer.java

@@ -6939,9 +6939,8 @@
        {
          // The port was already specified: this is a configuration error,
          // log a message.
          LocalizableMessage message =
              ERR_HOST_PORT_ALREADY_SPECIFIED.get(c.getConnectionHandlerName(),
                  listener.toString());
          LocalizableMessage message = ERR_HOST_PORT_ALREADY_SPECIFIED.get(
              c.getConnectionHandlerName(), listener);
          logger.error(message);
          errorMessages.add(message);


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

@@ -655,9 +655,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_ENTRYCACHE_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_ENTRYCACHE_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -427,9 +427,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_EXTENSION_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_EXTENSION_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -441,9 +441,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_IDMAPPER_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_IDMAPPER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -429,9 +429,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_KEYMANAGER_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_KEYMANAGER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

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

      messages.add(ERR_CONFIG_RETENTION_POLICY_CANNOT_CREATE_POLICY.get(
              String.valueOf(config.dn().toString()),
              stackTraceToSingleLineString(e)));
          config.dn(),stackTraceToSingleLineString(e)));
      resultCode = DirectoryServer.getServerErrorResultCode();
    }

@@ -218,10 +217,8 @@
      theClass = pd.loadClass(className, RetentionPolicy.class);
      theClass.newInstance();
    } catch (Exception e) {
      LocalizableMessage message = ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(className,
                                  config.dn().toString(),
                                  String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(
          ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(className, config.dn(), e));
      return false;
    }
    // Check that the implementation class implements the correct interface.
@@ -232,10 +229,8 @@
      theClass.getMethod("initializeLogRetentionPolicy", config
          .configurationClass());
    } catch (Exception e) {
      LocalizableMessage message = ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(className,
                                  config.dn().toString(),
                                  String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(
          ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(className, config.dn(), e));
      return false;
    }
    // The class is valid as far as we can tell.
@@ -267,11 +262,11 @@
      // Rethrow the exceptions thrown be the invoked method.
      Throwable e = ite.getTargetException();
      LocalizableMessage message = ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(
          className, config.dn().toString(), stackTraceToSingleLineString(e));
          className, config.dn(), stackTraceToSingleLineString(e));
      throw new ConfigException(message, e);
    } catch (Exception e) {
      LocalizableMessage message = ERR_CONFIG_RETENTION_POLICY_INVALID_CLASS.get(
          className, config.dn().toString(), String.valueOf(e));
          className, config.dn(), e);
      throw new ConfigException(message, e);
    }


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

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

      messages.add(ERR_CONFIG_ROTATION_POLICY_CANNOT_CREATE_POLICY.get(
              String.valueOf(config.dn().toString()),
      messages.add(ERR_CONFIG_ROTATION_POLICY_CANNOT_CREATE_POLICY.get(config.dn(),
              stackTraceToSingleLineString(e)));
      resultCode = DirectoryServer.getServerErrorResultCode();
    }
@@ -218,10 +217,8 @@
      theClass = pd.loadClass(className, RotationPolicy.class);
      theClass.newInstance();
    } catch (Exception e) {
      LocalizableMessage message = ERR_CONFIG_ROTATION_POLICY_INVALID_CLASS.get(className,
                                  config.dn().toString(),
                                  String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(
          ERR_CONFIG_ROTATION_POLICY_INVALID_CLASS.get(className, config.dn(), e));
      return false;
    }
    // Check that the implementation class implements the correct interface.
@@ -232,10 +229,8 @@
      theClass.getMethod("initializeLogRotationPolicy", config
          .configurationClass());
    } catch (Exception e) {
      LocalizableMessage message = ERR_CONFIG_ROTATION_POLICY_INVALID_CLASS.get(className,
                                  config.dn().toString(),
                                  String.valueOf(e));
      unacceptableReasons.add(message);
      unacceptableReasons.add(
          ERR_CONFIG_ROTATION_POLICY_INVALID_CLASS.get(className, config.dn(), e));
      return false;
    }
    // The class is valid as far as we can tell.
@@ -267,11 +262,11 @@
      // Rethrow the exceptions thrown be the invoked method.
      Throwable e = ite.getTargetException();
      LocalizableMessage message = ERR_CONFIG_ROTATION_POLICY_INVALID_CLASS.get(
          className, config.dn().toString(), stackTraceToSingleLineString(e));
          className, config.dn(), stackTraceToSingleLineString(e));
      throw new ConfigException(message, e);
    } catch (Exception e) {
      LocalizableMessage message = ERR_CONFIG_ROTATION_POLICY_INVALID_CLASS.get(
          className, config.dn().toString(), String.valueOf(e));
          className, config.dn(), e);
      throw new ConfigException(message, e);
    }


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

@@ -642,9 +642,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_SCHEMA_MR_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_SCHEMA_MR_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -423,9 +423,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_PWGENERATOR_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_PWGENERATOR_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -450,9 +450,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_PWSCHEME_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_PWSCHEME_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -435,9 +435,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_PWVALIDATOR_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_PWVALIDATOR_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -391,9 +391,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_PLUGIN_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_PLUGIN_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -423,9 +423,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_SASL_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_SASL_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -775,7 +775,7 @@

            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_LDAP_SYNTAX.get(
                    schemaFile,
                    v.getValue().toString() + ":  " + getExceptionMessage(e));
                    v.getValue() + ":  " + getExceptionMessage(e));

            if (failOnError)
            {
@@ -859,8 +859,7 @@
            logger.traceException(e);

            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_ATTR_TYPE.get(
                    schemaFile, v.getValue().toString() + ":  " +
                    getExceptionMessage(e));
                    schemaFile, v.getValue() + ":  " + getExceptionMessage(e));
            if (failOnError)
            {
              throw new ConfigException(message, e);
@@ -944,7 +943,7 @@

            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_OC.get(
                    schemaFile,
                    v.getValue().toString() + ":  " + getExceptionMessage(e));
                    v.getValue() + ":  " + getExceptionMessage(e));

            if (failOnError)
            {
@@ -1025,8 +1024,7 @@
            logger.traceException(e);

            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_NAME_FORM.get(
                    schemaFile,  v.getValue().toString() + ":  " +
                    getExceptionMessage(e));
                    schemaFile,  v.getValue() + ":  " + getExceptionMessage(e));

            if (failOnError)
            {
@@ -1109,8 +1107,7 @@
            logger.traceException(e);

            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_DCR.get(
                    schemaFile,v.getValue().toString() + ":  " +
                    getExceptionMessage(e));
                    schemaFile,v.getValue() + ":  " + getExceptionMessage(e));

            if (failOnError)
            {
@@ -1193,8 +1190,7 @@
            logger.traceException(e);

            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_DSR.get(
                    schemaFile, v.getValue().toString() + ":  " +
                                        getExceptionMessage(e));
                    schemaFile, v.getValue() + ":  " + getExceptionMessage(e));

            if (failOnError)
            {
@@ -1278,8 +1274,7 @@

            LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_PARSE_MRU.get(
                    schemaFile,
                    v.getValue().toString() + ":  " +
                    getExceptionMessage(e));
                    v.getValue() + ":  " + getExceptionMessage(e));

            if (failOnError)
            {

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

@@ -160,15 +160,13 @@
          break;
        }
      }
      LocalizableMessage message = ERR_PWPOLICY_NO_PWDPOLICY_OC.get(subentry.getDN()
          .toString());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
          ERR_PWPOLICY_NO_PWDPOLICY_OC.get(subentry.getDN()));
    }
    else if (!objectClasses.containsKey(pwdPolicyOC))
    {
      LocalizableMessage message = ERR_PWPOLICY_NO_PWDPOLICY_OC.get(subentry.getDN()
          .toString());
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION, message);
      throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
          ERR_PWPOLICY_NO_PWDPOLICY_OC.get(subentry.getDN()));
    }

    // Subentry DN for this password policy.
@@ -186,8 +184,7 @@
      {
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
            ERR_PWPOLICY_UNDEFINED_PASSWORD_ATTRIBUTE.get(
                this.passwordPolicySubentryDN.toNormalizedString(),
                value.toString()));
                this.passwordPolicySubentryDN.toNormalizedString(), value));
      }

      // Check the syntax.
@@ -233,7 +230,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(PWD_ATTR_MINAGE,
                value.toString(), ne.getLocalizedMessage()));
                value, ne.getLocalizedMessage()));
      }
    }
    else
@@ -254,7 +251,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(PWD_ATTR_MAXAGE,
                value.toString(), ne.getLocalizedMessage()));
                value, ne.getLocalizedMessage()));
      }
    }
    else
@@ -275,7 +272,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(PWD_ATTR_INHISTORY,
                value.toString(), ne.getLocalizedMessage()));
                value, ne.getLocalizedMessage()));
      }
    }
    else
@@ -297,7 +294,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(PWD_ATTR_CHECKQUALITY,
                value.toString(), ne.getLocalizedMessage()));
                value, ne.getLocalizedMessage()));
      }
    }

@@ -315,7 +312,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(PWD_ATTR_MINLENGTH,
                value.toString(), ne.getLocalizedMessage()));
                value, ne.getLocalizedMessage()));
      }
    }

@@ -332,8 +329,7 @@
      else
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(PWD_ATTR_LOCKOUT,
                value.toString()));
            ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(PWD_ATTR_LOCKOUT, value));
      }
    }

@@ -351,7 +347,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(PWD_ATTR_EXPIREWARNING,
                value.toString(), ne.getLocalizedMessage()));
                value, ne.getLocalizedMessage()));
      }
    }
    else
@@ -372,7 +368,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(PWD_ATTR_GRACEAUTHNLIMIT,
                value.toString(), ne.getLocalizedMessage()));
                value, ne.getLocalizedMessage()));
      }
    }
    else
@@ -393,7 +389,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(PWD_ATTR_LOCKOUTDURATION,
                value.toString(), ne.getLocalizedMessage()));
                value, ne.getLocalizedMessage()));
      }
    }
    else
@@ -414,7 +410,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(PWD_ATTR_MAXFAILURE,
                value.toString(), ne.getLocalizedMessage()));
                value, ne.getLocalizedMessage()));
      }
    }
    else
@@ -434,7 +430,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(PWD_ATTR_MUSTCHANGE,
                value.toString()));
                value));
      }
    }
    else
@@ -454,7 +450,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(PWD_ATTR_ALLOWUSERCHANGE,
                value.toString()));
                value));
      }
    }
    else
@@ -475,7 +471,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_BOOLEAN_VALUE.get(PWD_ATTR_SAFEMODIFY,
                value.toString()));
                value));
      }
    }
    else
@@ -497,8 +493,7 @@
      {
        throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
            ERR_CONFIG_ATTR_INVALID_INT_VALUE.get(
                PWD_ATTR_FAILURECOUNTINTERVAL, value.toString(),
                ne.getLocalizedMessage()));
                PWD_ATTR_FAILURECOUNTINTERVAL, value, ne.getLocalizedMessage()));
      }
    }
    else
@@ -528,7 +523,7 @@
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                  ERR_PWPOLICY_UNKNOWN_VALIDATOR.get(
                      this.passwordPolicySubentryDN.toNormalizedString(),
                      validatorDN.toString(), PWD_ATTR_VALIDATOR));
                      validatorDN, PWD_ATTR_VALIDATOR));
            }
            pValidatorNames.add(validatorDN);
          }

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

@@ -431,9 +431,8 @@
            }
          }

          LocalizableMessage message = ERR_CONFIG_TRUSTMANAGER_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_TRUSTMANAGER_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -1582,10 +1582,8 @@
        LocalizableMessage message =
            ERR_REGISTER_WORKFLOW_BASE_DN_ALREADY_EXISTS.get(
                workflowID, networkGroupID, node.getWorkflowImpl()
                    .getWorkflowId(), workflowNode.getWorkflowImpl()
                    .getBaseDN().toString());
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
            message);
                    .getWorkflowId(), workflowNode.getWorkflowImpl().getBaseDN());
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }
    }
  }

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

@@ -422,9 +422,7 @@


        default:
          LocalizableMessage message = ERR_PLUGIN_NETWORKGROUP_INVALID_PLUGIN_TYPE.get(
                  pluginType.toString());
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_NETWORKGROUP_INVALID_PLUGIN_TYPE.get(pluginType));
          configAcceptable = false;
      }
    }

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

@@ -543,8 +543,7 @@
            if (ResultCode.SUCCESS != addOperation.getResultCode()) {
              throw new DirectoryException(
                      addOperation.getResultCode(),
         ERR_CRYPTOMGR_FAILED_TO_INITIATE_INSTANCE_KEY_GENERATION.get(
                 entry.getName().toString()));
                      ERR_CRYPTOMGR_FAILED_TO_INITIATE_INSTANCE_KEY_GENERATION.get(entry.getName()));
            }
          }
          else {
@@ -557,7 +556,7 @@
      logger.traceException(ex);
      throw new CryptoManagerException(
            ERR_CRYPTOMGR_FAILED_TO_RETRIEVE_INSTANCE_CERTIFICATE.get(
                    entryDN.toString(), getExceptionMessage(ex)), ex);
                    entryDN, getExceptionMessage(ex)), ex);
    }
    //The certificate can never be null. The LocalizableMessage digest code that will
    //use it later throws a NPE if the certificate is null.
@@ -686,8 +685,7 @@
        if (ResultCode.SUCCESS != addOperation.getResultCode()) {
          throw new DirectoryException(
                  addOperation.getResultCode(),
            ERR_CRYPTOMGR_FAILED_TO_ADD_INSTANCE_KEY_ENTRY_TO_ADS.get(
                    entry.getName().toString()));
                  ERR_CRYPTOMGR_FAILED_TO_ADD_INSTANCE_KEY_ENTRY_TO_ADS.get(entry.getName()));
        }
      }
    } catch (DirectoryException ex) {
@@ -759,8 +757,7 @@
      logger.traceException(ex);
      throw new CryptoManagerException(
            ERR_CRYPTOMGR_FAILED_TO_RETRIEVE_ADS_TRUSTSTORE_CERTS.get(
                    instanceKeysDN.toString(),
                    getExceptionMessage(ex)), ex);
                    instanceKeysDN, getExceptionMessage(ex)), ex);
    }
    return(certificateMap);
  }
@@ -1178,8 +1175,7 @@
      if (symmetricKey == null)
      {
        throw new CryptoManagerException(
                ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_DECODE.get(
                        entry.getName().toString()));
                ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_DECODE.get(entry.getName()));
      }
      secretKey = decodeSymmetricKeyAttribute(symmetricKey);
      CipherKeyEntry.importCipherKeyEntry(this, keyID, transformation,
@@ -1201,8 +1197,7 @@
      if (internalModify.getResultCode() != ResultCode.SUCCESS)
      {
        throw new CryptoManagerException(
                ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_ADD_KEY.get(
                        entry.getName().toString()));
                ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_ADD_KEY.get(entry.getName()));
      }
    }
    catch (DirectoryException ex)
@@ -1210,7 +1205,7 @@
      logger.traceException(ex);
      throw new CryptoManagerException(
              ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_OTHER.get(
                      entry.getName().toString(), ex.getMessage()), ex);
                      entry.getName(), ex.getMessage()), ex);
    }
  }

@@ -1273,8 +1268,7 @@
        if (symmetricKey == null)
        {
          throw new CryptoManagerException(
               ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_DECODE.get(
                    entry.getName().toString()));
               ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_DECODE.get(entry.getName()));
        }
        secretKey = decodeSymmetricKeyAttribute(symmetricKey);
        MacKeyEntry.importMacKeyEntry(this, keyID, algorithm,
@@ -1297,8 +1291,7 @@
        if (internalModify.getResultCode() != ResultCode.SUCCESS)
        {
          throw new CryptoManagerException(
               ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_ADD_KEY.get(
                    entry.getName().toString()));
               ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_TO_ADD_KEY.get(entry.getName()));
        }
      }
      else
@@ -1314,7 +1307,7 @@
      logger.traceException(ex);
      throw new CryptoManagerException(
              ERR_CRYPTOMGR_IMPORT_KEY_ENTRY_FAILED_OTHER.get(
                      entry.getName().toString(), ex.getMessage()), ex);
                      entry.getName(), ex.getMessage()), ex);
    }
  }

@@ -1771,8 +1764,7 @@
      {
        throw new CryptoManagerException(
                ERR_CRYPTOMGR_SYMMETRIC_KEY_ENTRY_ADD_FAILED.get(
                        entry.getName().toString(),
                        addOperation.getErrorMessage()));
                        entry.getName(), addOperation.getErrorMessage()));
      }
    }

@@ -2312,8 +2304,7 @@
      {
        throw new CryptoManagerException(
                ERR_CRYPTOMGR_SYMMETRIC_KEY_ENTRY_ADD_FAILED.get(
                        entry.getName().toString(),
                        addOperation.getErrorMessage()));
                        entry.getName(), addOperation.getErrorMessage()));
      }
    }


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

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

      LocalizableMessage message = ERR_PWSCHEME_CANNOT_BASE64_DECODE_STORED_PASSWORD.get(
          storedPassword.toString(), String.valueOf(e));
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message,
                                   e);
          storedPassword, e);
      throw new DirectoryException(ResultCode.INVALID_CREDENTIALS, message, e);
    }
  }


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

@@ -288,10 +288,9 @@
          }
        }

        invalidReason
            .append(ERR_CHARSET_VALIDATOR_TOO_FEW_OPTIONAL_CHAR_SETS
                .get(requiredOptionalCharacterSets,
                    builder.toString()));
        invalidReason.append(
            ERR_CHARSET_VALIDATOR_TOO_FEW_OPTIONAL_CHAR_SETS.get(
                requiredOptionalCharacterSets, builder));
        return false;
      }
    }

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

@@ -376,10 +376,8 @@
      DN configRootDN = DN.valueOf(DN_CONFIG_ROOT);
      if (! entry.getName().equals(configRootDN))
      {
        LocalizableMessage message = ERR_CONFIG_FILE_INVALID_BASE_DN.get(
                               f.getAbsolutePath(), entry.getName().toString(),
                               DN_CONFIG_ROOT);
        throw new InitializationException(message);
        throw new InitializationException(ERR_CONFIG_FILE_INVALID_BASE_DN.get(
            f.getAbsolutePath(), entry.getName(), DN_CONFIG_ROOT));
      }
    }
    catch (InitializationException ie)
@@ -456,11 +454,8 @@
      {
        close(reader);

        LocalizableMessage message = ERR_CONFIG_FILE_DUPLICATE_ENTRY.get(
                               entryDN.toString(),
                               String.valueOf(reader.getLastEntryLineNumber()),
                               f.getAbsolutePath());
        throw new InitializationException(message);
        throw new InitializationException(ERR_CONFIG_FILE_DUPLICATE_ENTRY.get(
            entryDN, reader.getLastEntryLineNumber(), f.getAbsolutePath()));
      }


@@ -470,11 +465,8 @@
      {
        close(reader);

        LocalizableMessage message = ERR_CONFIG_FILE_UNKNOWN_PARENT.get(
                               entryDN.toString(),
                               reader.getLastEntryLineNumber(),
                               f.getAbsolutePath());
        throw new InitializationException(message);
        throw new InitializationException(ERR_CONFIG_FILE_UNKNOWN_PARENT.get(
            entryDN, reader.getLastEntryLineNumber(), f.getAbsolutePath()));
      }

      ConfigEntry parentEntry = configEntries.get(parentDN);
@@ -2306,7 +2298,7 @@
      logger.traceException(e);

      LocalizableMessage message = ERR_CONFIG_FILE_WRITE_ERROR.get(
          configEntry.getDN().toString(), String.valueOf(e));
          configEntry.getDN(), e);
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message, e);
    }

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

@@ -124,9 +124,7 @@
        if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
        {
          throw new ConfigException(ERR_EXACTMAP_ATTR_UNINDEXED.get(
                                         configuration.dn().toString(),
                                         t.getNameOrOID(),
                                         b.getBackendID()));
              configuration.dn(), t.getNameOrOID(), b.getBackendID()));
        }
      }
    }
@@ -326,9 +324,7 @@
        if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
        {
          unacceptableReasons.add(ERR_EXACTMAP_ATTR_UNINDEXED.get(
                                       configuration.dn().toString(),
                                       t.getNameOrOID(),
                                       b.getBackendID()));
              configuration.dn(), t.getNameOrOID(), b.getBackendID()));
          configAcceptable = false;
        }
      }

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

@@ -377,8 +377,7 @@
      if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
      {
        LocalizableMessage message = WARN_SATUACM_ATTR_UNINDEXED.get(
            configuration.dn().toString(),
            t.getNameOrOID(), b.getBackendID());
            configuration.dn(), t.getNameOrOID(), b.getBackendID());
        messages.add(message);
        logger.error(message);
      }

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

@@ -369,8 +369,7 @@

    buffer.append(")");

    LocalizableMessage message = ERR_CONFIG_JMX_NO_METHOD.get(
        buffer.toString(), String.valueOf(configEntryDN));
    LocalizableMessage message = ERR_CONFIG_JMX_NO_METHOD.get(buffer, configEntryDN);
    throw new MBeanException(new ConfigException(message));
  }


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

@@ -151,9 +151,7 @@
        if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
        {
          throw new ConfigException(ERR_REGEXMAP_ATTR_UNINDEXED.get(
                                         configuration.dn().toString(),
                                         t.getNameOrOID(),
                                         b.getBackendID()));
              configuration.dn(), t.getNameOrOID(), b.getBackendID()));
        }
      }
    }
@@ -351,9 +349,7 @@
        if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
        {
          unacceptableReasons.add(ERR_REGEXMAP_ATTR_UNINDEXED.get(
                                       configuration.dn().toString(),
                                       t.getNameOrOID(),
                                       b.getBackendID()));
              configuration.dn(), t.getNameOrOID(), b.getBackendID()));
          configAcceptable = false;
        }
      }
@@ -366,10 +362,8 @@
    }
    catch (PatternSyntaxException pse)
    {
      LocalizableMessage message = ERR_REGEXMAP_INVALID_MATCH_PATTERN.get(
                      configuration.getMatchPattern(),
                                  pse.getMessage());
      unacceptableReasons.add(message);
      unacceptableReasons.add(ERR_REGEXMAP_INVALID_MATCH_PATTERN.get(
          configuration.getMatchPattern(), pse.getMessage()));
      configAcceptable = false;
    }


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

@@ -47,6 +47,7 @@
import org.opends.server.config.ConfigException;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.util.Utils;
import org.opends.server.types.AccountStatusNotification;
import org.opends.server.types.AccountStatusNotificationProperty;
import org.opends.server.types.AccountStatusNotificationType;
@@ -143,8 +144,7 @@
    List<Properties> propList = DirectoryServer.getMailServerPropertySets();
    if ((propList == null) || propList.isEmpty())
    {
      throw new ConfigException(ERR_SMTP_ASNH_NO_MAIL_SERVERS_CONFIGURED.get(
                                     configuration.dn().toString()));
      throw new ConfigException(ERR_SMTP_ASNH_NO_MAIL_SERVERS_CONFIGURED.get(configuration.dn()));
    }

    // Make sure that either an explicit recipient list or a set of email
@@ -154,8 +154,7 @@
    if (((mailAttrs == null) || mailAttrs.isEmpty()) &&
        ((recipients == null) || recipients.isEmpty()))
    {
      throw new ConfigException(ERR_SMTP_ASNH_NO_RECIPIENTS.get(
                                     configuration.dn().toString()));
      throw new ConfigException(ERR_SMTP_ASNH_NO_RECIPIENTS.get(configuration.dn()));
    }
  }

@@ -186,8 +185,7 @@
      int colonPos = s.indexOf(':');
      if (colonPos < 0)
      {
        throw new ConfigException(ERR_SMTP_ASNH_SUBJECT_NO_COLON.get(s,
                                       configuration.dn().toString()));
        throw new ConfigException(ERR_SMTP_ASNH_SUBJECT_NO_COLON.get(s, configuration.dn()));
      }

      String notificationTypeName = s.substring(0, colonPos).trim();
@@ -195,16 +193,13 @@
           AccountStatusNotificationType.typeForName(notificationTypeName);
      if (t == null)
      {
        throw new ConfigException(
                       ERR_SMTP_ASNH_SUBJECT_INVALID_NOTIFICATION_TYPE.get(
                            s, configuration.dn().toString(),
                            notificationTypeName));
        throw new ConfigException(ERR_SMTP_ASNH_SUBJECT_INVALID_NOTIFICATION_TYPE.get(
            s, configuration.dn(), notificationTypeName));
      }
      else if (map.containsKey(t))
      {
        throw new ConfigException(ERR_SMTP_ASNH_SUBJECT_DUPLICATE_TYPE.get(
                                       configuration.dn().toString(),
                                       notificationTypeName));
            configuration.dn(), notificationTypeName));
      }

      map.put(t, s.substring(colonPos+1).trim());
@@ -248,8 +243,7 @@
      int colonPos = s.indexOf(':');
      if (colonPos < 0)
      {
        throw new ConfigException(ERR_SMTP_ASNH_TEMPLATE_NO_COLON.get(s,
                                       configuration.dn().toString()));
        throw new ConfigException(ERR_SMTP_ASNH_TEMPLATE_NO_COLON.get(s, configuration.dn()));
      }

      String notificationTypeName = s.substring(0, colonPos).trim();
@@ -257,16 +251,13 @@
           AccountStatusNotificationType.typeForName(notificationTypeName);
      if (t == null)
      {
        throw new ConfigException(
                       ERR_SMTP_ASNH_TEMPLATE_INVALID_NOTIFICATION_TYPE.get(
                            s, configuration.dn().toString(),
                            notificationTypeName));
        throw new ConfigException(ERR_SMTP_ASNH_TEMPLATE_INVALID_NOTIFICATION_TYPE.get(
            s, configuration.dn(), notificationTypeName));
      }
      else if (map.containsKey(t))
      {
        throw new ConfigException(ERR_SMTP_ASNH_TEMPLATE_DUPLICATE_TYPE.get(
                                       configuration.dn().toString(),
                                       notificationTypeName));
            configuration.dn(), notificationTypeName));
      }

      String path = s.substring(colonPos+1).trim();
@@ -279,7 +270,7 @@
      if (! f.exists())
      {
        throw new ConfigException(ERR_SMTP_ASNH_TEMPLATE_NO_SUCH_FILE.get(
                                       path, configuration.dn().toString()));
                                       path, configuration.dn()));
      }

      map.put(t, parseTemplateFile(f));
@@ -480,19 +471,11 @@
      logger.traceException(e);

      throw new ConfigException(ERR_SMTP_ASNH_TEMPLATE_CANNOT_PARSE.get(
                                     f.getAbsolutePath(),
                                     currentConfig.dn().toString(),
                                     getExceptionMessage(e)));
          f.getAbsolutePath(), currentConfig.dn(), getExceptionMessage(e)));
    }
    finally
    {
      try
      {
        if (reader != null)
        {
          reader.close();
        }
      } catch (Exception e) {}
      Utils.closeSilently(reader);
    }
  }

@@ -672,9 +655,8 @@
    {
      logger.traceException(e);

      logger.error(ERR_SMTP_ASNH_CANNOT_SEND_MESSAGE.get(notificationType.getName(),
                    notification.getUserDN().toString(),
                    getExceptionMessage(e)));
      logger.error(ERR_SMTP_ASNH_CANNOT_SEND_MESSAGE.get(
          notificationType.getName(), notification.getUserDN(), getExceptionMessage(e)));
    }
  }

@@ -695,8 +677,7 @@
    List<Properties> propList = DirectoryServer.getMailServerPropertySets();
    if ((propList == null) || propList.isEmpty())
    {
      unacceptableReasons.add(ERR_SMTP_ASNH_NO_MAIL_SERVERS_CONFIGURED.get(
                                   configuration.dn().toString()));
      unacceptableReasons.add(ERR_SMTP_ASNH_NO_MAIL_SERVERS_CONFIGURED.get(configuration.dn()));
      configAcceptable = false;
    }

@@ -708,8 +689,7 @@
    if (((mailAttrs == null) || mailAttrs.isEmpty()) &&
        ((recipients == null) || recipients.isEmpty()))
    {
      unacceptableReasons.add(ERR_SMTP_ASNH_NO_RECIPIENTS.get(
                                   configuration.dn().toString()));
      unacceptableReasons.add(ERR_SMTP_ASNH_NO_RECIPIENTS.get(configuration.dn()));
      configAcceptable = false;
    }


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

@@ -150,9 +150,7 @@
          buffer.append(iterator.next());
        }
      }
      LocalizableMessage message = ERR_SOFTREFCACHE_CANNOT_INITIALIZE.get(
        buffer.toString());
      throw new ConfigException(message);
      throw new ConfigException(ERR_SOFTREFCACHE_CANNOT_INITIALIZE.get(buffer));
    }
  }


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

@@ -426,11 +426,8 @@
      if (modifyOperation.getResultCode() != ResultCode.SUCCESS)
      {
        LocalizableMessage msg = ERR_STATICGROUP_ADD_MEMBER_UPDATE_FAILED.get(
                String.valueOf(nestedGroupDN),
                String.valueOf(groupEntryDN),
                modifyOperation.getErrorMessage().toString());
        throw new DirectoryException(modifyOperation.getResultCode(),
                                     msg);
            nestedGroupDN, groupEntryDN, modifyOperation.getErrorMessage());
        throw new DirectoryException(modifyOperation.getResultCode(), msg);
      }


@@ -695,8 +692,7 @@
      if (modifyOperation.getResultCode() != ResultCode.SUCCESS)
      {
        LocalizableMessage message = ERR_STATICGROUP_ADD_MEMBER_UPDATE_FAILED.
            get(String.valueOf(userDN), String.valueOf(groupEntryDN),
                modifyOperation.getErrorMessage().toString());
            get(userDN, groupEntryDN, modifyOperation.getErrorMessage());
        throw new DirectoryException(modifyOperation.getResultCode(), message);
      }

@@ -750,8 +746,7 @@
      if (modifyOperation.getResultCode() != ResultCode.SUCCESS)
      {
        LocalizableMessage message = ERR_STATICGROUP_REMOVE_MEMBER_UPDATE_FAILED.
            get(String.valueOf(userDN), String.valueOf(groupEntryDN),
                modifyOperation.getErrorMessage().toString());
            get(userDN, groupEntryDN, modifyOperation.getErrorMessage());
        throw new DirectoryException(modifyOperation.getResultCode(), message);
      }


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

@@ -585,8 +585,7 @@
        if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
        {
          LocalizableMessage message = WARN_SATUACM_ATTR_UNINDEXED.get(
              configuration.dn().toString(),
              t.getNameOrOID(), b.getBackendID());
              configuration.dn(), t.getNameOrOID(), b.getBackendID());
          messages.add(message);
          logger.error(message);
        }

 opendj3-server-dev/src/server/org/opends/server/loggers/AbstractLogger.java

@@ -266,8 +266,7 @@
      {
        logger.traceException(e);
        messages.add(ERR_CONFIG_LOGGER_CANNOT_CREATE_LOGGER.get(
                String.valueOf(config.dn().toString()),
                stackTraceToSingleLineString(e)));
            config.dn(), stackTraceToSingleLineString(e)));
        resultCode = DirectoryServer.getServerErrorResultCode();
      }
    }

 opendj3-server-dev/src/server/org/opends/server/loggers/FileNumberRetentionPolicy.java

@@ -102,15 +102,10 @@
    File[] files = fileNamingPolicy.listFiles();
    if(files == null)
    {
      LocalizableMessage message =
          ERR_LOGGER_ERROR_LISTING_FILES.get(
              fileNamingPolicy.getInitialName().toString());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
          ERR_LOGGER_ERROR_LISTING_FILES.get(fileNamingPolicy.getInitialName()));
    }

    ArrayList<File> filesToDelete = new ArrayList<File>();

    if (files.length <= numFiles)
    {
      return new File[0];
@@ -119,11 +114,11 @@
    // Sort files based on last modified time.
    Arrays.sort(files, new FileComparator());

    ArrayList<File> filesToDelete = new ArrayList<File>();
    for (int j = numFiles; j < files.length; j++)
    {
      filesToDelete.add(files[j]);
    }

    return filesToDelete.toArray(new File[0]);
  }


 opendj3-server-dev/src/server/org/opends/server/loggers/FreeDiskSpaceRetentionPolicy.java

@@ -109,15 +109,10 @@
    File[] files = fileNamingPolicy.listFiles();
    if(files == null)
    {
      LocalizableMessage message =
          ERR_LOGGER_ERROR_LISTING_FILES.get(
              fileNamingPolicy.getInitialName().toString());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
          ERR_LOGGER_ERROR_LISTING_FILES.get(fileNamingPolicy.getInitialName()));
    }

    List<File> filesToDelete = new ArrayList<File>();

    if(files.length <= 0)
    {
      return new File[0];
@@ -152,6 +147,7 @@
    // Sort files based on last modified time.
    Arrays.sort(files, new FileComparator());

    List<File> filesToDelete = new ArrayList<File>();
    long freedSpace = 0;
    for (int j = files.length - 1; j < 1; j--)
    {
@@ -162,7 +158,6 @@
        break;
      }
    }

    return filesToDelete.toArray(new File[filesToDelete.size()]);
  }


 opendj3-server-dev/src/server/org/opends/server/loggers/LogPublisherErrorHandler.java

@@ -68,10 +68,8 @@
  {
    if(!writeErroroccurred)
    {
      LocalizableMessage msg = ERR_LOGGER_ERROR_WRITING_RECORD.get(
              publisherConfigDN.toString(),
              stackTraceToSingleLineString(ex));
      System.err.println(msg);
      System.err.println(ERR_LOGGER_ERROR_WRITING_RECORD.get(
          publisherConfigDN, stackTraceToSingleLineString(ex)));
      writeErroroccurred = true;
    }
  }
@@ -95,10 +93,8 @@
   */
  public void handleCloseError(Throwable ex)
  {
    LocalizableMessage msg = ERR_LOGGER_ERROR_CLOSING_FILE.get(
            publisherConfigDN.toString(),
            stackTraceToSingleLineString(ex));
    System.err.println(msg);
    System.err.println(ERR_LOGGER_ERROR_CLOSING_FILE.get(
        publisherConfigDN, stackTraceToSingleLineString(ex)));
  }

  /**
@@ -108,23 +104,21 @@
   */
  public void handleFlushError(Throwable ex)
  {
    LocalizableMessage msg = ERR_LOGGER_ERROR_FLUSHING_BUFFER.get(
            publisherConfigDN.toString(),
            stackTraceToSingleLineString(ex));
    System.err.println(msg);
    System.err.println(ERR_LOGGER_ERROR_FLUSHING_BUFFER.get(
        publisherConfigDN, stackTraceToSingleLineString(ex)));
  }

  /**
   * Handle an exception which occured while trying to list log files
   * Handle an exception which occurred while trying to list log files
   * in a directory.
   * @param retentionPolicy - the retention policy being enforced when
   *                          the exception occured.
   *                          the exception occurred.
   * @param ex - the exception occurred.
   */
  public void handleDeleteError(RetentionPolicy retentionPolicy, Throwable ex)
  {
    LocalizableMessage msg = ERR_LOGGER_ERROR_ENFORCING_RETENTION_POLICY.get(
            retentionPolicy.toString(), publisherConfigDN.toString(),
            retentionPolicy, publisherConfigDN,
            stackTraceToSingleLineString(ex));
    System.err.println(msg);
  }

 opendj3-server-dev/src/server/org/opends/server/loggers/SizeBasedRetentionPolicy.java

@@ -107,11 +107,8 @@
    File[] files = fileNamingPolicy.listFiles();
    if(files == null)
    {
      LocalizableMessage message =
          ERR_LOGGER_ERROR_LISTING_FILES.get(
              fileNamingPolicy.getInitialName().toString());
      throw new DirectoryException(DirectoryServer.getServerErrorResultCode(),
                                   message);
          ERR_LOGGER_ERROR_LISTING_FILES.get(fileNamingPolicy.getInitialName()));
    }

    long totalLength = 0;

 opendj3-server-dev/src/server/org/opends/server/loggers/TextAccessLogPublisher.java

@@ -220,11 +220,9 @@
    }
    catch (final Exception e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn().toString(), stackTraceToSingleLineString(e));
      resultCode = DirectoryServer.getServerErrorResultCode();
      messages.add(message);

      messages.add(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

    return new ConfigChangeResult(resultCode, adminActionRequired, messages);
@@ -290,15 +288,13 @@
    }
    catch (final DirectoryException e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(cfg
          .dn().toString(), String.valueOf(e));
      throw new InitializationException(message, e);
      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(cfg.dn(), e), e);
    }
    catch (final IOException e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(
          logFile.toString(), cfg.dn().toString(), String.valueOf(e));
      throw new InitializationException(message, e);
      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(logFile, cfg.dn(), e), e);

    }


 opendj3-server-dev/src/server/org/opends/server/loggers/TextAuditLogPublisher.java

@@ -157,11 +157,9 @@
    }
    catch (Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(config.dn()
          .toString(), stackTraceToSingleLineString(e));
      resultCode = DirectoryServer.getServerErrorResultCode();
      messages.add(message);

      messages.add(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

    return new ConfigChangeResult(resultCode, adminActionRequired, messages);
@@ -231,17 +229,13 @@
    }
    catch (DirectoryException e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(cfg.dn()
          .toString(), String.valueOf(e));
      throw new InitializationException(message, e);

      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(cfg.dn(), e), e);
    }
    catch (IOException e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(logFile
          .toString(), cfg.dn().toString(), String.valueOf(e));
      throw new InitializationException(message, e);

      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(logFile, cfg.dn(), e), e);
    }

    initializeFilters(cfg);

 opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java

@@ -177,17 +177,13 @@
    }
    catch(DirectoryException e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn().toString(), String.valueOf(e));
      throw new InitializationException(message, e);

      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(config.dn(), e), e);
    }
    catch(IOException e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(
          logFile.toString(), config.dn().toString(), String.valueOf(e));
      throw new InitializationException(message, e);

      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(logFile, config.dn(), e), e);
    }


@@ -377,12 +373,9 @@
    }
    catch(Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
              config.dn().toString(),
              stackTraceToSingleLineString(e));
      resultCode = DirectoryServer.getServerErrorResultCode();
      messages.add(message);

      messages.add(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

    return new ConfigChangeResult(resultCode, adminActionRequired, messages);

 opendj3-server-dev/src/server/org/opends/server/loggers/TextErrorLogPublisher.java

@@ -174,17 +174,13 @@
    }
    catch(DirectoryException e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn().toString(), String.valueOf(e));
      throw new InitializationException(message, e);

      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(config.dn(), e), e);
    }
    catch(IOException e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(
          logFile.toString(), config.dn().toString(), String.valueOf(e));
      throw new InitializationException(message, e);

      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(logFile, config.dn(), e), e);
    }

    Set<ErrorLogPublisherCfgDefn.DefaultSeverity> defSevs =
@@ -559,11 +555,9 @@
    }
    catch(Exception e)
    {
      LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
              config.dn().toString(),
              stackTraceToSingleLineString(e));
      resultCode = DirectoryServer.getServerErrorResultCode();
      messages.add(message);
      messages.add(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

    return new ConfigChangeResult(resultCode, adminActionRequired, messages);

 opendj3-server-dev/src/server/org/opends/server/loggers/TextHTTPAccessLogPublisher.java

@@ -239,10 +239,9 @@
    }
    catch (final Exception e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn().toString(), stackTraceToSingleLineString(e));
      resultCode = DirectoryServer.getServerErrorResultCode();
      messages.add(message);
      messages.add(ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(
          config.dn(), stackTraceToSingleLineString(e)));
    }

    return new ConfigChangeResult(resultCode, adminActionRequired, messages);
@@ -269,8 +268,8 @@
        subtract(fields, ALL_SUPPORTED_FIELDS);
    if (!unsupportedFields.isEmpty())
    { // there are some unsupported fields. List them.
      return WARN_CONFIG_LOGGING_UNSUPPORTED_FIELDS_IN_LOG_FORMAT.get(cfg.dn()
          .toString(), collectionToString(unsupportedFields, ", "));
      return WARN_CONFIG_LOGGING_UNSUPPORTED_FIELDS_IN_LOG_FORMAT.get(
          cfg.dn(), collectionToString(unsupportedFields, ", "));
    }
    if (fields.size() == unsupportedFields.size())
    { // all fields are unsupported
@@ -359,15 +358,13 @@
    }
    catch (final DirectoryException e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(cfg
          .dn().toString(), String.valueOf(e));
      throw new InitializationException(message, e);
      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_CREATE_WRITER.get(cfg.dn(), e), e);
    }
    catch (final IOException e)
    {
      final LocalizableMessage message = ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(
          logFile.toString(), cfg.dn().toString(), String.valueOf(e));
      throw new InitializationException(message, e);
      throw new InitializationException(
          ERR_CONFIG_LOGGING_CANNOT_OPEN_FILE.get(logFile, cfg.dn(), e), e);
    }

    this.cfg = cfg;

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

@@ -279,9 +279,7 @@


        default:
          LocalizableMessage message = ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE.get(
                  pluginType.toString());
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_CHANGE_NUMBER_INVALID_PLUGIN_TYPE.get(pluginType));
          configAcceptable = false;
      }
    }

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

@@ -258,9 +258,7 @@


        default:
          LocalizableMessage message = ERR_PLUGIN_ENTRYUUID_INVALID_PLUGIN_TYPE.get(
                  pluginType.toString());
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_ENTRYUUID_INVALID_PLUGIN_TYPE.get(pluginType));
          configAcceptable = false;
      }
    }

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

@@ -337,9 +337,7 @@


        default:
          LocalizableMessage message = ERR_PLUGIN_LASTMOD_INVALID_PLUGIN_TYPE.get(
                  pluginType.toString());
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_LASTMOD_INVALID_PLUGIN_TYPE.get(pluginType));
          configAcceptable = false;
      }
    }

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

@@ -621,9 +621,7 @@


        default:
          LocalizableMessage message = ERR_PLUGIN_PWPIMPORT_INVALID_PLUGIN_TYPE.get(
                  pluginType.toString());
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_PWPIMPORT_INVALID_PLUGIN_TYPE.get(pluginType));
          configAcceptable = false;
      }
    }

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

@@ -304,8 +304,7 @@

        default:
          isAcceptable = false;
          unacceptableReasons.add(ERR_PLUGIN_REFERENT_INVALID_PLUGIN_TYPE.get(
                                  t.toString()));
          unacceptableReasons.add(ERR_PLUGIN_REFERENT_INVALID_PLUGIN_TYPE.get(t));
      }
    }

@@ -337,9 +336,7 @@
        {
          isAcceptable = false;
          unacceptableReasons.add(ERR_PLUGIN_REFERENT_ATTR_UNINDEXED.get(
                                         pluginCfg.dn().toString(),
                                         type.getNameOrOID(),
                                         b.getBackendID()));
              pluginCfg.dn(), type.getNameOrOID(), b.getBackendID()));
        }
      }
    }
@@ -1267,10 +1264,7 @@
            return PluginResult.PreOperation.stopProcessing(
                  ResultCode.CONSTRAINT_VIOLATION,
                  ERR_PLUGIN_REFERENT_NAMINGCONTEXT_MISMATCH.get(
                    valueEntryDN.toString(),
                    attr.getName(),
                    entryDN.toString()
                  )
                      valueEntryDN, attr.getName(), entryDN)
                );
          }

@@ -1289,10 +1283,7 @@
          return PluginResult.PreOperation.stopProcessing(
            ResultCode.CONSTRAINT_VIOLATION,
            ERR_PLUGIN_REFERENT_ENTRY_MISSING.get(
            valueEntryDN.toString(),
            attr.getName(),
            entryDN.toString()
            ));
                valueEntryDN, attr.getName(), entryDN));
        }

        /* Verify that the value entry conforms to the filter.
@@ -1304,11 +1295,7 @@
          return PluginResult.PreOperation.stopProcessing(
            ResultCode.CONSTRAINT_VIOLATION,
            ERR_PLUGIN_REFERENT_FILTER_MISMATCH.get(
              valueEntry.getName().toString(),
              attr.getName(),
              entryDN.toString(),
              filter.toString())
            );
                valueEntry.getName(), attr.getName(), entryDN, filter));
        }
      }
    }

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

@@ -493,9 +493,7 @@


        default:
          LocalizableMessage message = ERR_PLUGIN_7BIT_INVALID_PLUGIN_TYPE.get(
                  pluginType.toString());
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_7BIT_INVALID_PLUGIN_TYPE.get(pluginType));
          configAcceptable = false;
      }
    }

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

@@ -144,9 +144,7 @@
        if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
        {
          throw new ConfigException(ERR_PLUGIN_UNIQUEATTR_ATTR_UNINDEXED.get(
                                         configuration.dn().toString(),
                                         t.getNameOrOID(),
                                         b.getBackendID()));
              configuration.dn(), t.getNameOrOID(), b.getBackendID()));
        }
      }
    }
@@ -322,8 +320,7 @@
          uniqueAttrValue2Dn.remove(v2);
        }
        LocalizableMessage msg = ERR_PLUGIN_UNIQUEATTR_ATTR_NOT_UNIQUE.get(
            t.getNameOrOID(), v.getValue().toString(),
            conflictDN.toString());
            t.getNameOrOID(), v.getValue(), conflictDN);
        return PluginResult.PreOperation.stopProcessing(
            ResultCode.CONSTRAINT_VIOLATION, msg);
      }
@@ -332,10 +329,8 @@
    {
      logger.traceException(de);

      LocalizableMessage message =
          ERR_PLUGIN_UNIQUEATTR_INTERNAL_ERROR.get(
                             de.getResultCode().toString(),
                             de.getMessageObject());
      LocalizableMessage message = ERR_PLUGIN_UNIQUEATTR_INTERNAL_ERROR.get(
          de.getResultCode(), de.getMessageObject());

      // Try some cleanup before returning, to avoid memory leaks
      for (AttributeValue v2 : recordedValues)
@@ -555,9 +550,9 @@
                               t.getNameOrOID(),
                               operation.getConnectionID(),
                               operation.getOperationID(),
                               v.getValue().toString(),
                               updatedEntryDN.toString(),
                               conflictDN.toString());
                               v.getValue(),
                               updatedEntryDN,
                               conflictDN);
        DirectoryServer.sendAlertNotification(this,
                             ALERT_TYPE_UNIQUE_ATTR_SYNC_CONFLICT,
                             message);
@@ -570,8 +565,8 @@
      LocalizableMessage message = ERR_PLUGIN_UNIQUEATTR_INTERNAL_ERROR_SYNC.get(
                            operation.getConnectionID(),
                            operation.getOperationID(),
                            updatedEntryDN.toString(),
                            de.getResultCode().toString(),
                            updatedEntryDN,
                            de.getResultCode(),
                            de.getMessageObject());
      DirectoryServer.sendAlertNotification(this,
                           ALERT_TYPE_UNIQUE_ATTR_SYNC_ERROR, message);
@@ -731,9 +726,7 @@
          break;

        default:
          LocalizableMessage message = ERR_PLUGIN_UNIQUEATTR_INVALID_PLUGIN_TYPE.get(
                                 pluginType.toString());
          unacceptableReasons.add(message);
          unacceptableReasons.add(ERR_PLUGIN_UNIQUEATTR_INVALID_PLUGIN_TYPE.get(pluginType));
          configAcceptable = false;
      }
    }
@@ -752,8 +745,7 @@
        if ((b != null) && (! b.isIndexed(t, IndexType.EQUALITY)))
        {
          unacceptableReasons.add(ERR_PLUGIN_UNIQUEATTR_ATTR_UNINDEXED.get(
                                       configuration.dn().toString(),
                                       t.getNameOrOID(), b.getBackendID()));
              configuration.dn(), t.getNameOrOID(), b.getBackendID()));
          configAcceptable = false;
        }
      }

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

@@ -151,16 +151,16 @@
        // The path specified as the LDIF directory exists, but isn't a
        // directory.  This is probably a mistake, and we should at least log
        // a warning message.
        logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_NOT_DIRECTORY.get(ldifDirectory.getAbsolutePath(),
                      configuration.dn().toString()));
        logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_NOT_DIRECTORY.get(
            ldifDirectory.getAbsolutePath(), configuration.dn()));
      }
    }
    else
    {
      // The path specified as the LDIF directory doesn't exist.  We should log
      // a warning message saying that we won't do anything until it's created.
      logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_MISSING.get(ldifDirectory.getAbsolutePath(),
                    configuration.dn().toString()));
      logger.warn(WARN_LDIF_CONNHANDLER_LDIF_DIRECTORY_MISSING.get(
          ldifDirectory.getAbsolutePath(), configuration.dn()));
    }

    this.currentConfig = configuration;
@@ -462,7 +462,7 @@

          LocalizableMessage m = INFO_LDIF_CONNHANDLER_RESULT_CODE.get(
                           operation.getResultCode().getIntValue(),
                           operation.getResultCode().toString());
                           operation.getResultCode());
          writer.writeComment(m, 78);

          LocalizableMessageBuilder errorMessage = operation.getErrorMessage();

 opendj3-server-dev/src/server/org/opends/server/replication/plugin/FractionalLDIFImportPlugin.java

@@ -143,10 +143,7 @@
          break;

        default:
          LocalizableMessage message =
            ERR_PLUGIN_FRACTIONAL_LDIF_IMPORT_INVALID_PLUGIN_TYPE.get(
            t.toString());
          throw new ConfigException(message);
        throw new ConfigException(ERR_PLUGIN_FRACTIONAL_LDIF_IMPORT_INVALID_PLUGIN_TYPE.get(t));
      }
    }
  }
@@ -282,9 +279,8 @@
                getStaticReplicationDomainFractionalConfig(entry);
            } catch (Exception ex)
            {
              LocalizableMessage message = ERR_FRACTIONAL_COULD_NOT_RETRIEVE_CONFIG.get(
                entry.toString());
              return PluginResult.ImportLDIF.stopEntryProcessing(message);
              return PluginResult.ImportLDIF.stopEntryProcessing(
                  ERR_FRACTIONAL_COULD_NOT_RETRIEVE_CONFIG.get(entry));
            }
          } else
          {

 opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java

@@ -776,7 +776,7 @@
      // Should not happen as configuration in domain root entry is flushed
      // from valid configuration in local variables
      logger.error(NOTE_ERR_FRACTIONAL.get(
          fractionalConfig.getBaseDn().toString(),
          fractionalConfig.getBaseDn(),
          stackTraceToSingleLineString(e)));
      return false;
    }
@@ -810,7 +810,7 @@
      // from valid configuration in local variables so both should have already
      // been checked
      logger.error(NOTE_ERR_FRACTIONAL.get(
          fractionalConfig.getBaseDn().toString(),
          fractionalConfig.getBaseDn(),
          stackTraceToSingleLineString(e)));
      return false;
    }
@@ -1646,7 +1646,7 @@
        if (fractionalFilterOperation(addOperation, false))
        {
          LocalizableMessage msg = NOTE_ERR_FRACTIONAL_FORBIDDEN_OPERATION.get(
            getBaseDNString(), addOperation.toString());
            getBaseDNString(), addOperation);
          return new SynchronizationProviderResult.StopProcessing(
            ResultCode.UNWILLING_TO_PERFORM, msg);
        }
@@ -1774,7 +1774,7 @@
        if (fractionalFilterOperation(modifyDNOperation, false))
        {
          LocalizableMessage msg = NOTE_ERR_FRACTIONAL_FORBIDDEN_OPERATION.get(
            getBaseDNString(), modifyDNOperation.toString());
            getBaseDNString(), modifyDNOperation);
          return new SynchronizationProviderResult.StopProcessing(
            ResultCode.UNWILLING_TO_PERFORM, msg);
        }
@@ -1907,7 +1907,7 @@
            // Some attributes not compliant with fractional configuration :
            // forbid the operation
            LocalizableMessage msg = NOTE_ERR_FRACTIONAL_FORBIDDEN_OPERATION.get(
              getBaseDNString(), modifyOperation.toString());
              getBaseDNString(), modifyOperation);
            return new SynchronizationProviderResult.StopProcessing(
              ResultCode.UNWILLING_TO_PERFORM, msg);
        }
@@ -2016,8 +2016,7 @@
        }
        catch  (NoSuchElementException e)
        {
          logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(
              op.toString(), curCSN.toString()));
          logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(op, curCSN));
          return;
        }
      }
@@ -2054,8 +2053,7 @@
        }
        catch (NoSuchElementException e)
        {
          logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(
              op.toString(), curCSN.toString()));
          logger.error(ERR_OPERATION_NOT_FOUND_IN_PENDING.get(op, curCSN));
          return;
        }
        // If assured replication is enabled, this will wait for the matching
@@ -2068,7 +2066,7 @@
        {
          // This exception may only be raised if assured replication is enabled
          logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
              Long.toString(getAssuredTimeout()), msg.toString()));
              Long.toString(getAssuredTimeout()), msg));
        }
      }

@@ -2169,8 +2167,7 @@
       ResultCode res = newOp.getResultCode();
       if (res != ResultCode.SUCCESS)
       {
        logger.error(ERR_COULD_NOT_SOLVE_CONFLICT.get(
            entryDN.toString(), res.toString()));
        logger.error(ERR_COULD_NOT_SOLVE_CONFLICT.get(entryDN, res));
       }
     }
   }
@@ -2469,7 +2466,7 @@
           */
          LocalizableMessage message =
              ERR_EXCEPTION_REPLAYING_OPERATION.get(
                  stackTraceToSingleLineString(e), op.toString());
                  stackTraceToSingleLineString(e), op);
          replayErrorMsg = message.toString();
          updateError(csn);
        } else
@@ -2700,8 +2697,7 @@
      // The other type of errors can not be caused by naming conflicts.
      // Log a message for the repair tool.
      logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
          op.toString(), ctx.getCSN().toString(),
          result.toString(), op.getErrorMessage().toString()));
          op, ctx.getCSN(), result, op.getErrorMessage()));
      return true;
    }
  }
@@ -2769,8 +2765,7 @@
     // The other type of errors can not be caused by naming conflicts.
     // Log a message for the repair tool.
     logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
         op.toString(), ctx.getCSN().toString(),
         result.toString(), op.getErrorMessage().toString()));
         op, ctx.getCSN(), result, op.getErrorMessage()));
     return true;
   }
 }
@@ -2889,8 +2884,7 @@
    // The other type of errors can not be caused by naming conflicts.
    // Log a message for the repair tool.
    logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
        op.toString(), ctx.getCSN().toString(),
        result.toString(), op.getErrorMessage().toString()));
        op, ctx.getCSN(), result, op.getErrorMessage()));
    return true;
  }
}
@@ -2987,8 +2981,7 @@
      // The other type of errors can not be caused by naming conflicts.
      // log a message for the repair tool.
      logger.error(ERR_ERROR_REPLAYING_OPERATION.get(
          op.toString(), ctx.getCSN().toString(),
          result.toString(), op.getErrorMessage().toString()));
          op, ctx.getCSN(), result, op.getErrorMessage()));
      return true;
    }
  }

 opendj3-server-dev/src/server/org/opends/server/replication/server/DataServerHandler.java

@@ -201,9 +201,7 @@
    ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
    if (newStatus == ServerStatus.INVALID_STATUS)
    {
      LocalizableMessage msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
          Integer.toString(serverId), status.toString(), event.toString());
      logger.error(msg);
      logger.error(ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDN(), serverId, status, event));
      // Only change allowed is from NORMAL_STATUS to DEGRADED_STATUS and vice
      // versa. We may be trying to change the status while another status has
      // just been entered: e.g a full update has just been engaged.
@@ -328,14 +326,11 @@
    ServerStatus newStatus = StatusMachine.computeNewStatus(status, event);
    if (newStatus == ServerStatus.INVALID_STATUS)
    {
      LocalizableMessage msg = ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
          Integer.toString(serverId), status.toString(), event.toString());
      logger.error(msg);
      logger.error(ERR_RS_CANNOT_CHANGE_STATUS.get(getBaseDN(), serverId, status, event));
      return ServerStatus.INVALID_STATUS;
    }

    status = newStatus;

    return status;
  }

@@ -581,11 +576,8 @@
    // Sanity check: is it a valid initial status?
    if (!isValidInitialStatus(this.status))
    {
      LocalizableMessage message = ERR_RS_INVALID_INIT_STATUS.get(
          this.status.toString(),
          getBaseDNString(),
          Integer.toString(serverId));
      throw new DirectoryException(ResultCode.OTHER, message);
      throw new DirectoryException(ResultCode.OTHER,
          ERR_RS_INVALID_INIT_STATUS.get( this.status, getBaseDN(), serverId));
    }

    this.refUrls = startSessionMsg.getReferralsURLs();

 opendj3-server-dev/src/server/org/opends/server/replication/server/ECLServerHandler.java

@@ -873,7 +873,7 @@
      }
      throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM,
          ERR_RESYNC_REQUIRED_UNKNOWN_DOMAIN_IN_PROVIDED_COOKIE.get(
              startStatesFromProvidedCookie.toString(), sb.toString()));
              startStatesFromProvidedCookie, sb));
    }

    return results;

 opendj3-server-dev/src/server/org/opends/server/replication/server/MsgQueue.java

@@ -125,10 +125,8 @@
            // Adding 2 msgs with the same CSN is ok only when
            // the 2 msgs are the same
            bytesCount += (update.size() - msgSameCSN.size());
            LocalizableMessage errMsg = ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN.get(
                msgSameCSN.getCSN().toString(),
                msgSameCSN.toString(), update.toString());
            logger.error(errMsg);
            logger.error(ERR_RSQUEUE_DIFFERENT_MSGS_WITH_SAME_CN.get(
                msgSameCSN.getCSN(), msgSameCSN, update));
          }
        }
        catch(Exception e)

 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationBackend.java

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

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

 opendj3-server-dev/src/server/org/opends/server/replication/server/ReplicationServerDomain.java

@@ -240,11 +240,8 @@
        } else
        {
          // Unknown assured mode: should never happen
          LocalizableMessage errorMsg = ERR_RS_UNKNOWN_ASSURED_MODE.get(
            Integer.toString(localReplicationServer.getServerId()),
            assuredMode.toString(), baseDN.toNormalizedString(),
            update.toString());
          logger.error(errorMsg);
          logger.error(ERR_RS_UNKNOWN_ASSURED_MODE.get(
              localReplicationServer.getServerId(), assuredMode, baseDN, update));
          assuredMessage = false;
        }
      } else
@@ -594,11 +591,8 @@
    if (safeDataLevel < (byte) 1)
    {
      // Should never happen
      LocalizableMessage errorMsg = ERR_UNKNOWN_ASSURED_SAFE_DATA_LEVEL.get(
        Integer.toString(localReplicationServer.getServerId()),
        Byte.toString(safeDataLevel), baseDN.toNormalizedString(),
        update.toString());
      logger.error(errorMsg);
      logger.error(ERR_UNKNOWN_ASSURED_SAFE_DATA_LEVEL.get(
        localReplicationServer.getServerId(), Byte.toString(safeDataLevel), baseDN, update));
    } else if (sourceGroupId == groupId
    // Assured feature does not cross different group IDS
        && isSameGenerationId(sourceHandler.getGenerationId()))
@@ -749,7 +743,7 @@
            mb.append(ERR_RS_ERROR_SENDING_ACK.get(
              Integer.toString(localReplicationServer.getServerId()),
              Integer.toString(origServer.getServerId()),
              csn.toString(), baseDN.toNormalizedString()));
              csn, baseDN.toNormalizedString()));
            mb.append(" ");
            mb.append(stackTraceToSingleLineString(e));
            logger.error(mb.toMessage());
@@ -827,7 +821,7 @@
            mb.append(ERR_RS_ERROR_SENDING_ACK.get(
                Integer.toString(localReplicationServer.getServerId()),
                Integer.toString(origServer.getServerId()),
                csn.toString(), baseDN.toNormalizedString()));
                csn, baseDN.toNormalizedString()));
            mb.append(" ");
            mb.append(stackTraceToSingleLineString(e));
            logger.error(mb.toMessage());

 opendj3-server-dev/src/server/org/opends/server/replication/server/ServerReader.java

@@ -130,15 +130,13 @@
                long referenceGenerationId = handler.getReferenceGenId();
                if (dsStatus == BAD_GEN_ID_STATUS)
                  logger.warn(WARN_IGNORING_UPDATE_FROM_DS_BADGENID.get(handler.getReplicationServerId(),
                      updateMsg.getCSN().toString(),
                      handler.getBaseDNString(), handler.getServerId(),
                      updateMsg.getCSN(), handler.getBaseDN(), handler.getServerId(),
                      session.getReadableRemoteAddress(),
                      handler.getGenerationId(),
                      referenceGenerationId));
                if (dsStatus == FULL_UPDATE_STATUS)
                  logger.warn(WARN_IGNORING_UPDATE_FROM_DS_FULLUP.get(handler.getReplicationServerId(),
                      updateMsg.getCSN().toString(),
                      handler.getBaseDNString(), handler.getServerId(),
                      updateMsg.getCSN(), handler.getBaseDN(), handler.getServerId(),
                      session.getReadableRemoteAddress()));
                filtered = true;
              }
@@ -155,9 +153,7 @@
                logger.error(
                    WARN_IGNORING_UPDATE_FROM_RS.get(
                        handler.getReplicationServerId(),
                        updateMsg.getCSN().toString(),
                        handler.getBaseDNString(),
                        handler.getServerId(),
                        updateMsg.getCSN(), handler.getBaseDN(), handler.getServerId(),
                        session.getReadableRemoteAddress(),
                        handler.getGenerationId(),
                        referenceGenerationId));
@@ -195,11 +191,8 @@
            }
            catch(Exception e)
            {
              errMessage =
                ERR_RECEIVED_CHANGE_STATUS_NOT_FROM_DS.get(
                    handler.getBaseDNString(),
                    Integer.toString(handler.getServerId()),
                    csMsg.toString());
              errMessage = ERR_RECEIVED_CHANGE_STATUS_NOT_FROM_DS.get(
                  handler.getBaseDN(), handler.getServerId(), csMsg);
              logger.error(errMessage);
            }
          } else if (msg instanceof ChangeTimeHeartbeatMsg)
@@ -255,8 +248,7 @@
       * The remote server has sent an unknown message,
       * close the connection.
       */
      errMessage = NOTE_READER_EXCEPTION.get(
          handler.toString(), stackTraceToSingleLineString(e));
      errMessage = NOTE_READER_EXCEPTION.get(handler, stackTraceToSingleLineString(e));
      logger.error(errMessage);
    }
    finally

 opendj3-server-dev/src/server/org/opends/server/replication/server/ServerWriter.java

@@ -126,8 +126,7 @@
            if (dsStatus == ServerStatus.BAD_GEN_ID_STATUS)
            {
              logger.warn(WARN_IGNORING_UPDATE_TO_DS_BADGENID.get(handler.getReplicationServerId(),
                  update.getCSN().toString(),
                  handler.getBaseDNString(), handler.getServerId(),
                  update.getCSN(), handler.getBaseDN(), handler.getServerId(),
                  session.getReadableRemoteAddress(),
                  handler.getGenerationId(),
                  referenceGenerationId));
@@ -135,8 +134,7 @@
            else if (dsStatus == ServerStatus.FULL_UPDATE_STATUS)
            {
              logger.warn(WARN_IGNORING_UPDATE_TO_DS_FULLUP.get(handler.getReplicationServerId(),
                  update.getCSN().toString(),
                  handler.getBaseDNString(), handler.getServerId(),
                  update.getCSN(), handler.getBaseDN(), handler.getServerId(),
                  session.getReadableRemoteAddress()));
            }
            continue;
@@ -152,12 +150,9 @@
              || referenceGenerationId == -1
              || handler.getGenerationId() == -1)
          {
            logger.error(
                WARN_IGNORING_UPDATE_TO_RS.get(
            logger.error(WARN_IGNORING_UPDATE_TO_RS.get(
                    handler.getReplicationServerId(),
                    update.getCSN().toString(),
                    handler.getBaseDNString(),
                    handler.getServerId(),
                update.getCSN(), handler.getBaseDN(), handler.getServerId(),
                    session.getReadableRemoteAddress(),
                    handler.getGenerationId(),
                    referenceGenerationId));

 opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationBroker.java

@@ -2661,8 +2661,8 @@
                      serverId, previousRsServerID, rs.replicationServer,
                      bestRsServerId,
                      baseDN.toNormalizedString(),
                      evals.getEvaluation(previousRsServerID).toString(),
                      evals.getEvaluation(bestRsServerId).toString());
                      evals.getEvaluation(previousRsServerID),
                      evals.getEvaluation(bestRsServerId));
                }
                logger.error(message);
                if (logger.isTraceEnabled())

 opendj3-server-dev/src/server/org/opends/server/replication/service/ReplicationDomain.java

@@ -888,8 +888,7 @@
        requested servers. Log problem
        */
        logger.error(NOTE_DS_RECEIVED_ACK_ERROR.get(
            getBaseDNString(), Integer.toString(getServerId()),
            update.toString(), ack.errorsToString()));
            getBaseDN(), getServerId(), update, ack.errorsToString()));

        List<Integer> failedServers = ack.getFailedServers();

@@ -1458,7 +1457,7 @@
          throw new DirectoryException(
              ResultCode.OTHER,
              ERR_INIT_NO_SUCCESS_START_FROM_SERVERS.get(
                  ieCtx.failureList.toString()));
                  ieCtx.failureList));
        }

        exportBackend(new BufferedOutputStream(new ReplOutputStream(this)));
@@ -1554,7 +1553,7 @@
      exportRootException = new DirectoryException(ResultCode.OTHER,
              ERR_INIT_NO_SUCCESS_END_FROM_SERVERS.get(
                  Long.toString(getGenerationID()),
                  ieCtx.failureList.toString()));
                  ieCtx.failureList));
    }

    // Don't forget to release IEcontext acquired at beginning.
@@ -2426,7 +2425,7 @@
    if (newStatus == ServerStatus.INVALID_STATUS)
    {
      logger.error(ERR_DS_CANNOT_CHANGE_STATUS.get(getBaseDNString(),
          String.valueOf(getServerId()), status.toString(), event.toString()));
          String.valueOf(getServerId()), status, event));
      return;
    }

@@ -3224,8 +3223,8 @@
      else if (getAssuredMode() != AssuredMode.SAFE_DATA_MODE)
      {
        logger.error(ERR_DS_UNKNOWN_ASSURED_MODE.get(String.valueOf(getServerId()),
            msg.getAssuredMode().toString(), getBaseDNString(),
            msg.toString()));
            msg.getAssuredMode(), getBaseDNString(),
            msg));
      }
        // Nothing to do in Assured safe data mode, only RS ack updates.
    }
@@ -3434,7 +3433,7 @@
    {
      // This exception may only be raised if assured replication is enabled
      logger.error(NOTE_DS_ACK_TIMEOUT.get(getBaseDNString(),
          Long.toString(getAssuredTimeout()), update.toString()));
          Long.toString(getAssuredTimeout()), update));
    }
  }


 opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java

@@ -586,11 +586,8 @@
                else if(!((ch>='0' && ch<='9') || (ch>='A' && ch<='Z') ||
                        (ch>='a' && ch<='z')))
                {
                  LocalizableMessage msg = ERR_ATTR_SYNTAX_ATTR_ILLEGAL_CHAR.get(
                            value.toString(), ch, index);
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       msg);
                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                      ERR_ATTR_SYNTAX_ATTR_ILLEGAL_CHAR.get(value, ch, index));
                }
                break;
            }

 opendj3-server-dev/src/server/org/opends/server/schema/BitStringEqualityMatchingRule.java

@@ -151,45 +151,17 @@
    int length = valueString.length();
    if (length < 3)
    {

      LocalizableMessage message = WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT.get(
              value.toString());
      switch (DirectoryServer.getSyntaxEnforcementPolicy())
      {
        case REJECT:
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        case WARN:
          logger.error(message);
          return ByteString.valueOf(valueString);
        default:
          return ByteString.valueOf(valueString);
      return reportInvalidSyntax(valueString,
          WARN_ATTR_SYNTAX_BIT_STRING_TOO_SHORT.get(value));
      }
    }


    if ((valueString.charAt(0) != '\'') ||
        (valueString.charAt(length-2) != '\'') ||
        (valueString.charAt(length-1) != 'B'))
    {

      LocalizableMessage message = WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED.get(
              value.toString());

      switch (DirectoryServer.getSyntaxEnforcementPolicy())
      {
        case REJECT:
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        case WARN:
          logger.error(
                  message);
          return ByteString.valueOf(valueString);
        default:
          return ByteString.valueOf(valueString);
      return reportInvalidSyntax(valueString,
          WARN_ATTR_SYNTAX_BIT_STRING_NOT_QUOTED.get(value));
      }
    }


    for (int i=1; i < (length-2); i++)
    {
@@ -201,14 +173,21 @@
          break;
        default:

          LocalizableMessage message = WARN_ATTR_SYNTAX_BIT_STRING_INVALID_BIT.get(
                  value.toString(), String.valueOf(valueString.charAt(i)));
        return reportInvalidSyntax(valueString,
            WARN_ATTR_SYNTAX_BIT_STRING_INVALID_BIT.get(value, valueString.charAt(i)));
      }
    }

    return ByteString.valueOf(valueString);
  }

  private ByteString reportInvalidSyntax(String valueString, LocalizableMessage message)
      throws DirectoryException
  {
        switch (DirectoryServer.getSyntaxEnforcementPolicy())
        {
          case REJECT:
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                         message);
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
          case WARN:
            logger.error(message);
            return ByteString.valueOf(valueString);
@@ -218,7 +197,3 @@
      }
    }

    return ByteString.valueOf(valueString);
  }
}


 opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java

@@ -233,7 +233,7 @@
          break;
        default:
          invalidReason.append(WARN_ATTR_SYNTAX_BIT_STRING_INVALID_BIT.get(
                  value.toString(), String.valueOf(valueString.charAt(i))));
              value, valueString.charAt(i)));
          return false;
      }
    }

 opendj3-server-dev/src/server/org/opends/server/schema/BooleanEqualityMatchingRule.java

@@ -160,8 +160,7 @@
    }
    else
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN.get(
              value.toString());
      LocalizableMessage message = WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN.get(value);

      switch (DirectoryServer.getSyntaxEnforcementPolicy())
      {

 opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java

@@ -251,8 +251,7 @@

    if (! returnValue)
    {
      invalidReason.append(WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN.get(
              value.toString()));
      invalidReason.append(WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN.get(value));
    }

    return returnValue;
@@ -270,16 +269,10 @@
   */
  public static AttributeValue createBooleanValue(boolean b)
  {
    if (b)
    {
      return AttributeValues.create(ServerConstants.TRUE_VALUE,
                                ServerConstants.TRUE_VALUE);
    }
    else
    {
      return AttributeValues.create(ServerConstants.FALSE_VALUE,
                                ServerConstants.FALSE_VALUE);
    }
    ByteString value = b
        ? ServerConstants.TRUE_VALUE
        : ServerConstants.FALSE_VALUE;
    return AttributeValues.create(value, value);
  }



 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5EqualityMatchingRule.java

@@ -188,8 +188,7 @@
        // enforcement is enabled, then we'll throw an exception.  Otherwise,
        // we'll get rid of the character.

        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(
                value.toString(), String.valueOf(c));
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(value, c);

        switch (DirectoryServer.getSyntaxEnforcementPolicy())
        {

 opendj3-server-dev/src/server/org/opends/server/schema/CaseExactIA5SubstringMatchingRule.java

@@ -188,8 +188,7 @@
        // This is not a valid character for an IA5 string.  If strict syntax
        // enforcement is enabled, then we'll throw an exception.  Otherwise,
        // we'll get rid of the character.
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(
                value.toString(), String.valueOf(c));
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(value, c);

        switch (DirectoryServer.getSyntaxEnforcementPolicy())
        {
@@ -274,8 +273,7 @@
        // This is not a valid character for an IA5 string.  If strict syntax
        // enforcement is enabled, then we'll throw an exception.  Otherwise,
        // we'll get rid of the character.
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(
                substring.toString(), String.valueOf(c));
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(substring, c);

        switch (DirectoryServer.getSyntaxEnforcementPolicy())
        {

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5EqualityMatchingRule.java

@@ -188,8 +188,7 @@
        // enforcement is enabled, then we'll throw an exception.  Otherwise,
        // we'll get rid of the character.

        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(
                value.toString(), String.valueOf(c));
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(value, c);

        switch (DirectoryServer.getSyntaxEnforcementPolicy())
        {

 opendj3-server-dev/src/server/org/opends/server/schema/CaseIgnoreIA5SubstringMatchingRule.java

@@ -187,8 +187,7 @@
        // This is not a valid character for an IA5 string.  If strict syntax
        // enforcement is enabled, then we'll throw an exception.  Otherwise,
        // we'll get rid of the character.
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(
                value.toString(), String.valueOf(c));
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(value, c);

        switch (DirectoryServer.getSyntaxEnforcementPolicy())
        {
@@ -273,8 +272,7 @@
        // This is not a valid character for an IA5 string.  If strict syntax
        // enforcement is enabled, then we'll throw an exception.  Otherwise,
        // we'll get rid of the character.
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(
                substring.toString(), String.valueOf(c));
        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(substring, c);

        switch (DirectoryServer.getSyntaxEnforcementPolicy())
        {

 opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java

@@ -612,10 +612,8 @@
            }
            else
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_UNKNOWN_AUXILIARY_CLASS.get(
                  valueStr, woidBuffer.toString());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
                  ERR_ATTR_SYNTAX_DCR_UNKNOWN_AUXILIARY_CLASS.get(valueStr, woidBuffer));
            }
          }
          else if (oc.getObjectClassType() != ObjectClassType.AUXILIARY)
@@ -655,15 +653,12 @@
              // requires an attribute type that we don't know anything about.
              if (allowUnknownElements)
              {
                attr = DirectoryServer.getDefaultAttributeType(
                                            woidBuffer.toString());
                attr = DirectoryServer.getDefaultAttributeType(woidBuffer.toString());
              }
              else
              {
                LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_UNKNOWN_REQUIRED_ATTR.get(
                    valueStr, woidBuffer.toString());
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
                    ERR_ATTR_SYNTAX_DCR_UNKNOWN_REQUIRED_ATTR.get(valueStr, woidBuffer));
              }
            }

@@ -705,10 +700,8 @@
            }
            else
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_UNKNOWN_REQUIRED_ATTR.get(
                  valueStr, woidBuffer.toString());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
                  ERR_ATTR_SYNTAX_DCR_UNKNOWN_REQUIRED_ATTR.get(valueStr, woidBuffer));
            }
          }

@@ -745,10 +738,8 @@
              }
              else
              {
                LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_UNKNOWN_OPTIONAL_ATTR.get(
                    valueStr, woidBuffer.toString());
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
                    ERR_ATTR_SYNTAX_DCR_UNKNOWN_OPTIONAL_ATTR.get(valueStr, woidBuffer));
              }
            }

@@ -790,10 +781,8 @@
            }
            else
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_UNKNOWN_OPTIONAL_ATTR.get(
                  valueStr, woidBuffer.toString());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
                  ERR_ATTR_SYNTAX_DCR_UNKNOWN_OPTIONAL_ATTR.get(valueStr, woidBuffer));
            }
          }

@@ -874,10 +863,8 @@
            }
            else
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_DCR_UNKNOWN_PROHIBITED_ATTR.get(
                  valueStr, woidBuffer.toString());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
                  ERR_ATTR_SYNTAX_DCR_UNKNOWN_PROHIBITED_ATTR.get(valueStr, woidBuffer));
            }
          }


 opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java

@@ -463,10 +463,8 @@
        nameForm = schema.getNameForm(woidBuffer.toString());
        if ((nameForm == null) && (! allowUnknownElements))
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_DSR_UNKNOWN_NAME_FORM.get(
              valueStr, woidBuffer.toString());
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DSR_UNKNOWN_NAME_FORM.get(valueStr, woidBuffer));
        }
      }
      else if (lowerTokenName.equals("sup"))

 opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java

@@ -286,8 +286,7 @@
    StringTokenizer tokenizer = new StringTokenizer(stringValue, " $");
    if (! tokenizer.hasMoreTokens())
    {
      invalidReason.append(ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS.get(
              value.toString()));
      invalidReason.append(ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS.get(value));
      return false;
    }


 opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameEqualityMatchingRule.java

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



import static org.opends.messages.SchemaMessages.*;
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
@@ -35,7 +33,6 @@
import java.util.Collection;
import java.util.Collections;

import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.core.DirectoryServer;
import org.forgerock.i18n.slf4j.LocalizedLogger;
@@ -46,8 +43,6 @@
import org.opends.server.types.DirectoryException;
import org.opends.server.types.ResultCode;



/**
 * This class defines the distinguishedNameMatch matching rule defined in X.520
 * and referenced in RFC 2252.
@@ -179,10 +174,8 @@
      if (DirectoryServer.getSyntaxEnforcementPolicy() ==
          AcceptRejectWarn.REJECT)
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID.get(
            value.toString(), String.valueOf(e));
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_INVALID.get(value, e));
      }
      else
      {

 opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java

@@ -25,11 +25,9 @@
 *      Portions Copyright 2012-2014 ForgeRock AS
 */
package org.opends.server.schema;
import org.forgerock.i18n.LocalizableMessage;

import org.forgerock.i18n.slf4j.LocalizedLogger;



import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.opends.server.api.ApproximateMatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -40,12 +38,10 @@
import org.opends.server.core.DirectoryServer;
import org.forgerock.opendj.ldap.ByteSequence;


import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.server.schema.SchemaConstants.*;


/**
 * This class implements the IA5 string attribute syntax, which is simply a
 * set of ASCII characters.  By default, they will be treated in a
@@ -245,14 +241,10 @@
      b = value.byteAt(i);
      if ((b & 0x7F) != b)
      {

        LocalizableMessage message = WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(
                value.toString(), String.valueOf(b));
        invalidReason.append(message);
        invalidReason.append(WARN_ATTR_SYNTAX_IA5_ILLEGAL_CHARACTER.get(value, b));
        return false;
      }
    }

    return true;
  }


 opendj3-server-dev/src/server/org/opends/server/schema/IntegerEqualityMatchingRule.java

@@ -166,8 +166,7 @@
              }
              else
              {
                LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO.get(
                        value.toString());
                LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO.get(value);

                switch (DirectoryServer.getSyntaxEnforcementPolicy())
                {
@@ -188,8 +187,7 @@
              // This is OK as long as the first character isn't a dash.
              if (buffer.charAt(0) == '-')
              {
                LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO.get(
                        value.toString());
                LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO.get(value);

                switch (DirectoryServer.getSyntaxEnforcementPolicy())
                {
@@ -251,8 +249,7 @@
          }
          else
          {
            LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_MISPLACED_DASH.get(
                    value.toString());
            LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_MISPLACED_DASH.get(value);

            switch (DirectoryServer.getSyntaxEnforcementPolicy())
            {
@@ -271,8 +268,7 @@
          break;
        default:
          LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INVALID_CHARACTER.get(
                  value.toString(),
                  ((char) value.byteAt(i)), i);
              value, ((char) value.byteAt(i)), i);
          switch (DirectoryServer.getSyntaxEnforcementPolicy())
          {
            case REJECT:
@@ -291,8 +287,7 @@

    if (buffer.length() == 0)
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_EMPTY_VALUE.get(
              value.toString());
      LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_EMPTY_VALUE.get(value);

      switch (DirectoryServer.getSyntaxEnforcementPolicy())
      {
@@ -317,8 +312,7 @@
    }
    else if ((buffer.length() == 1) && (buffer.charAt(0) == '-'))
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_DASH_NEEDS_VALUE.get(
              value.toString());
      LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_DASH_NEEDS_VALUE.get(value);
      switch (DirectoryServer.getSyntaxEnforcementPolicy())
      {
        case REJECT:

 opendj3-server-dev/src/server/org/opends/server/schema/IntegerOrderingMatchingRule.java

@@ -178,9 +178,7 @@
              }
              else
              {

                LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO.get(
                        value.toString());
                LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO.get(value);

                switch (DirectoryServer.getSyntaxEnforcementPolicy())
                {
@@ -201,9 +199,7 @@
              // This is OK as long as the first character isn't a dash.
              if (buffer.charAt(0) == '-')
              {

                LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO.get(
                        value.toString());
                LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INITIAL_ZERO.get(value);

                switch (DirectoryServer.getSyntaxEnforcementPolicy())
                {
@@ -266,8 +262,7 @@
          }
          else
          {
            LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_MISPLACED_DASH.get(
                    value.toString());
            LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_MISPLACED_DASH.get(value);

            switch (DirectoryServer.getSyntaxEnforcementPolicy())
            {
@@ -287,8 +282,7 @@
          break;
        default:
          LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_INVALID_CHARACTER.get(
                  value.toString(),
                  ((char) value.byteAt(i)), i);
              value, ((char) value.byteAt(i)), i);
          switch (DirectoryServer.getSyntaxEnforcementPolicy())
          {
            case REJECT:
@@ -308,8 +302,7 @@

    if (buffer.length() == 0)
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_EMPTY_VALUE.get(
              value.toString());
      LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_EMPTY_VALUE.get(value);

      switch (DirectoryServer.getSyntaxEnforcementPolicy())
      {
@@ -321,8 +314,7 @@
          if (! logged)
          {
            logged = true;
            logger.error(
                    message);
            logger.error(message);
          }

          buffer.append("0");
@@ -335,8 +327,7 @@
    }
    else if ((buffer.length() == 1) && (buffer.charAt(0) == '-'))
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_DASH_NEEDS_VALUE.get(
              value.toString());
      LocalizableMessage message = WARN_ATTR_SYNTAX_INTEGER_DASH_NEEDS_VALUE.get(value);

      switch (DirectoryServer.getSyntaxEnforcementPolicy())
      {
@@ -348,8 +339,7 @@
          if (! logged)
          {
            logged = true;
            logger.error(
                    message);
            logger.error(message);
          }

          buffer.setCharAt(0, '0');

 opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java

@@ -540,11 +540,9 @@
          ByteString entry = ByteString.valueOf(v);
          if (entries.contains(entry))
          {
            LocalizableMessage message =
                  WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_DUPLICATE_VALUE.get(
                          valueStr, entry.toString(),pos);
            throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                  message);
                WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_DUPLICATE_VALUE.get(
                    valueStr, entry,pos));
          }
          entries.add(entry);
        }
@@ -1406,14 +1404,10 @@
    {
      //The value is acceptable if it belongs to the set.
      boolean isAllowed = entries.contains(value);

      if(!isAllowed)
      {
        LocalizableMessage message = WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_INVALID_VALUE.get(
                value.toString(),oid);
        invalidReason.append(message);
        invalidReason.append(WARN_ATTR_SYNTAX_LDAPSYNTAX_ENUM_INVALID_VALUE.get(value,oid));
      }

      return isAllowed;
    }


 opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java

@@ -544,10 +544,8 @@
              }
              else
              {
                LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR.get(
                    oid, woidBuffer.toString());
                throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                             message);
                    ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR.get(oid, woidBuffer));
              }
            }

@@ -589,10 +587,8 @@
            }
            else
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR.get(
                  oid, woidBuffer.toString());
              throw new DirectoryException(ResultCode.CONSTRAINT_VIOLATION,
                                           message);
                  ERR_ATTR_SYNTAX_MRUSE_UNKNOWN_ATTR.get(oid, woidBuffer));
            }
          }


 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringEqualityMatchingRule.java

@@ -168,7 +168,7 @@
        {
          // This is an illegal character.  Either log it or reject it.
          LocalizableMessage message = WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR.get(
                  value.toString(), String.valueOf(c), pos);
                  value, c, pos);

          switch (DirectoryServer.getSyntaxEnforcementPolicy())
          {

 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringOrderingMatchingRule.java

@@ -180,7 +180,7 @@
        {
          // This is an illegal character.  Either log it or reject it.
          LocalizableMessage message = WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR.get(
                  value.toString(), String.valueOf(c), pos);
                  value, c, pos);

          switch (DirectoryServer.getSyntaxEnforcementPolicy())
          {

 opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSubstringMatchingRule.java

@@ -167,7 +167,7 @@
        {
          // This is an illegal character.  Either log it or reject it.
          LocalizableMessage message = WARN_ATTR_SYNTAX_NUMERIC_STRING_ILLEGAL_CHAR.get(
                  value.toString(), String.valueOf(c), pos);
                  value, c, pos);

          switch (DirectoryServer.getSyntaxEnforcementPolicy())
          {

 opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java

@@ -552,11 +552,8 @@
                else if(!((ch>='0' && ch<='9') || (ch>='A' && ch<='Z') ||
                        (ch>='a' && ch<='z')))
                {
                  LocalizableMessage msg = ERR_OC_SYNTAX_ATTR_ILLEGAL_CHAR.get(
                            value.toString(), ch, index);
                  throw new DirectoryException(
                          ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       msg);
                  throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                      ERR_OC_SYNTAX_ATTR_ILLEGAL_CHAR.get(value, ch, index));
                }
                break;
            }

 opendj3-server-dev/src/server/org/opends/server/schema/ObjectIdentifierEqualityMatchingRule.java

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



import static org.opends.messages.SchemaMessages.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.server.schema.SchemaConstants.*;
@@ -36,7 +34,6 @@
import java.util.Collection;
import java.util.Collections;

import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.MatchingRule;
@@ -49,8 +46,6 @@
import org.opends.server.types.ObjectClass;
import org.opends.server.types.ResultCode;



/**
 * This class defines the objectIdentifierMatch matching rule defined in X.520
 * and referenced in RFC 2252.  This expects to work on OIDs and will match
@@ -213,10 +208,9 @@
        }
        else
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_OID_INVALID_VALUE.get(
              lowerValue, invalidReason.toString());
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_OID_INVALID_VALUE.get(
                  lowerValue, invalidReason));
        }

      case WARN:

 opendj3-server-dev/src/server/org/opends/server/schema/TimeBasedMatchingRuleFactory.java

@@ -856,9 +856,7 @@
            case 's':
              if(second >0)
              {
                 message =
                        WARN_ATTR_DUPLICATE_SECOND_ASSERTION_FORMAT.get(
                        value.toString(),date);
                 message = WARN_ATTR_DUPLICATE_SECOND_ASSERTION_FORMAT.get(value, date);
              }
              else
              {
@@ -868,9 +866,7 @@
            case 'm':
              if(minute >0)
              {
                 message =
                        WARN_ATTR_DUPLICATE_MINUTE_ASSERTION_FORMAT.get(
                        value.toString(),date);
                 message = WARN_ATTR_DUPLICATE_MINUTE_ASSERTION_FORMAT.get(value, date);
              }
              else
              {
@@ -880,9 +876,7 @@
            case 'h':
              if(hour >0)
              {
                 message =
                        WARN_ATTR_DUPLICATE_HOUR_ASSERTION_FORMAT.get(
                        value.toString(),date);
                 message = WARN_ATTR_DUPLICATE_HOUR_ASSERTION_FORMAT.get(value, date);
              }
              else
              {
@@ -892,15 +886,11 @@
            case 'D':
              if(number == 0)
              {
                message =
                        WARN_ATTR_INVALID_DATE_ASSERTION_FORMAT.get(
                        value.toString(), number);
                message = WARN_ATTR_INVALID_DATE_ASSERTION_FORMAT.get(value, number);
              }
              else if(date > 0)
              {
                message =
                        WARN_ATTR_DUPLICATE_DATE_ASSERTION_FORMAT.get(
                        value.toString(),date);
                message = WARN_ATTR_DUPLICATE_DATE_ASSERTION_FORMAT.get(value, date);
              }
              else
              {

 opendj3-server-dev/src/server/org/opends/server/schema/UUIDEqualityMatchingRule.java

@@ -149,19 +149,8 @@
  {
    if (value.length() != 36)
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(
              value.toString(), value.length());
      switch (DirectoryServer.getSyntaxEnforcementPolicy())
      {
        case REJECT:
          throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                                       message);
        case WARN:
          logger.error(message);
          return value.toByteString();
        default:
          return value.toByteString();
      }
      return reportInvalidAttrSyntax(value,
          WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(value, value.length()));
    }

    StringBuilder builder = new StringBuilder(36);
@@ -179,20 +168,8 @@
        case 23:
          if (c != '-')
          {
            LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(
                    value.toString(), i, String.valueOf(c));
            switch (DirectoryServer.getSyntaxEnforcementPolicy())
            {
              case REJECT:
                throw new DirectoryException(
                               ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
              case WARN:
                logger.error(
                        message);
                return value.toByteString();
              default:
                return value.toByteString();
            }
            return reportInvalidAttrSyntax(value,
                WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(value, i, c));
          }
          builder.append(c);
          break;
@@ -237,25 +214,28 @@
              builder.append('f');
              break;
            default:
              LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX.get(
                      value.toString(), i, String.valueOf(value.byteAt(i)));
              switch (DirectoryServer.getSyntaxEnforcementPolicy())
              {
                case REJECT:
                  throw new DirectoryException(
                                 ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
                case WARN:
                  logger.error(
                          message);
                  return value.toByteString();
                default:
                  return value.toByteString();
              }
            return reportInvalidAttrSyntax(value,
                WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX.get(value, i, value.byteAt(i)));
          }
      }
    }

    return ByteString.valueOf(builder.toString());
  }

  private ByteString reportInvalidAttrSyntax(ByteSequence value, LocalizableMessage message)
      throws DirectoryException
  {
    switch (DirectoryServer.getSyntaxEnforcementPolicy())
    {
      case REJECT:
        throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX, message);
      case WARN:
        logger.error(message);
        return value.toByteString();
      default:
        return value.toByteString();
    }
  }
}


 opendj3-server-dev/src/server/org/opends/server/schema/UUIDOrderingMatchingRule.java

@@ -162,8 +162,7 @@
  {
    if (value.length() != 36)
    {
      LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(
              value.toString(), value.length());
      LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH.get(value, value.length());
      switch (DirectoryServer.getSyntaxEnforcementPolicy())
      {
        case REJECT:
@@ -192,8 +191,7 @@
        case 23:
          if (c != '-')
          {
            LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(
                    value.toString(), i, String.valueOf(c));
            LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH.get(value, i, c);
            switch (DirectoryServer.getSyntaxEnforcementPolicy())
            {
              case REJECT:
@@ -249,8 +247,7 @@
              builder.append('f');
              break;
            default:
              LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX.get(
                      value.toString(), i, String.valueOf(c));
              LocalizableMessage message = WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX.get(value, i, c);
              switch (DirectoryServer.getSyntaxEnforcementPolicy())
              {
                case REJECT:

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

@@ -509,7 +509,7 @@
          builder.append(" ");
        }
        LocalizableMessage message = ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND.get(
            builder.toString(), typeClearBackend.getNameOrOID());
            builder, typeClearBackend.getNameOrOID());
        throw new DirectoryException(ResultCode.UNWILLING_TO_PERFORM, message);
      }
    }

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

@@ -368,8 +368,7 @@
      }
      if (repeatedBackends.length() > 0)
      {
        LocalizableMessage message = ERR_BACKUPDB_REPEATED_BACKEND_ID.get(
            repeatedBackends.toString());
        LocalizableMessage message = ERR_BACKUPDB_REPEATED_BACKEND_ID.get(repeatedBackends);
        err.println(wrapText(message, MAX_LINE_WIDTH));
        err.println(argParser.getUsage());
        return 1;

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

@@ -111,7 +111,7 @@
    if (serverRoot == null)
    {
      err.println(ERR_CREATERC_UNABLE_TO_DETERMINE_SERVER_ROOT.get(
                       PROPERTY_SERVER_ROOT, ENV_VAR_INSTALL_ROOT).toString());
                       PROPERTY_SERVER_ROOT, ENV_VAR_INSTALL_ROOT));
      return 1;
    }

@@ -189,8 +189,7 @@
      File f = new File(javaHome.getValue());
      if (! (f.exists() && f.isDirectory()))
      {
        err.println(ERR_CREATERC_JAVA_HOME_DOESNT_EXIST.get(
                         javaHome.getValue()).toString());
        err.println(ERR_CREATERC_JAVA_HOME_DOESNT_EXIST.get(javaHome.getValue()));
        return 1;
      }

@@ -302,12 +301,10 @@
    }
    catch (Exception e)
    {
      err.println(ERR_CREATERC_CANNOT_WRITE.get(
                       getExceptionMessage(e)).toString());
      err.println(ERR_CREATERC_CANNOT_WRITE.get(getExceptionMessage(e)));
      return 1;
    }


    // If we've gotten here, then everything has completed successfully.
    return 0;
  }

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

@@ -746,8 +746,7 @@
          }
          encodedPW = storageScheme.encodeAuthPassword(clearPW);

          LocalizableMessage message = ERR_ENCPW_ENCODED_PASSWORD.get(
                  encodedPW.toString());
          LocalizableMessage message = ERR_ENCPW_ENCODED_PASSWORD.get(encodedPW);
          out.println(message);
        }
        catch (DirectoryException de)

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

@@ -1259,7 +1259,7 @@
        builder.append(backend.getBaseDNs()[i].toNormalizedString());
      }
      LocalizableMessage message = ERR_LDIFIMPORT_MISSING_CLEAR_BACKEND.get(
              builder.toString(), clearBackend.getLongIdentifier());
              builder, clearBackend.getLongIdentifier());
      err.println(wrapText(message, MAX_LINE_WIDTH));
      return 1;
    }

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

@@ -263,14 +263,12 @@
            attributes.add(new LDAPAttribute(a));
          }
          protocolOp = new AddRequestProtocolOp(asn1OctetStr, attributes);
          out.println(INFO_PROCESSING_OPERATION.get(
                  operationType, asn1OctetStr.toString()));
          out.println(INFO_PROCESSING_OPERATION.get(operationType, asn1OctetStr));
          break;
        case DELETE:
          operationType = "DELETE";
          protocolOp = new DeleteRequestProtocolOp(asn1OctetStr);
          out.println(INFO_PROCESSING_OPERATION.get(
                  operationType, asn1OctetStr.toString()));
          out.println(INFO_PROCESSING_OPERATION.get(operationType, asn1OctetStr));
          break;
        case MODIFY:
          operationType = "MODIFY";
@@ -278,8 +276,7 @@
          ArrayList<RawModification> mods =
            new ArrayList<RawModification>(modEntry.getModifications());
          protocolOp = new ModifyRequestProtocolOp(asn1OctetStr, mods);
          out.println(INFO_PROCESSING_OPERATION.get(
                  operationType, asn1OctetStr.toString()));
          out.println(INFO_PROCESSING_OPERATION.get(operationType, asn1OctetStr));
          break;
        case MODIFY_DN:
          operationType = "MODIFY DN";
@@ -299,8 +296,7 @@
                 modDNEntry.deleteOldRDN());
          }

          out.println(INFO_PROCESSING_OPERATION.get(
                  operationType, asn1OctetStr.toString()));
          out.println(INFO_PROCESSING_OPERATION.get(operationType, asn1OctetStr));
          break;
        default:
          break;
@@ -415,9 +411,7 @@
          }
        } else
        {
          LocalizableMessage msg = INFO_OPERATION_SUCCESSFUL.get(
                  operationType, asn1OctetStr.toString());
          out.println(msg);
          out.println(INFO_OPERATION_SUCCESSFUL.get(operationType, asn1OctetStr));

          if (errorMessage != null)
          {
@@ -504,14 +498,13 @@
            if(c instanceof LDAPControl)
            {
              // Don't really need to decode since its just an octet string.
              out.println(INFO_CHANGE_NUMBER_CONTROL_RESULT.get(operationType,
                  ((LDAPControl)c).getValue().toString()));
              out.println(INFO_CHANGE_NUMBER_CONTROL_RESULT.get(
                  operationType, ((LDAPControl)c).getValue()));
            }
            else
            {
              out.println(INFO_CHANGE_NUMBER_CONTROL_RESULT.get(operationType,
                  ((ChangeNumberControlPlugin.ChangeNumberControl)c).
                      getCSN().toString()));
                  ((ChangeNumberControlPlugin.ChangeNumberControl)c).getCSN()));
            }
          }
        }

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

@@ -897,7 +897,7 @@
            if (pwPolicyWarningType != null)
            {
              LocalizableMessage message = INFO_LDAPPWMOD_PWPOLICY_WARNING.get(
                      pwPolicyWarningType.toString(),
                      pwPolicyWarningType,
                      pwPolicyControl.getWarningValue());
              out.println(wrapText(message, MAX_LINE_WIDTH));
            }
@@ -906,15 +906,13 @@
                 pwPolicyControl.getErrorType();
            if (pwPolicyErrorType != null)
            {
              LocalizableMessage message = INFO_LDAPPWMOD_PWPOLICY_ERROR.get(
                      pwPolicyErrorType.toString());
              LocalizableMessage message = INFO_LDAPPWMOD_PWPOLICY_ERROR.get(pwPolicyErrorType);
              out.println(wrapText(message, MAX_LINE_WIDTH));
            }
          }
          catch (Exception e)
          {
            LocalizableMessage message = ERR_LDAPPWMOD_CANNOT_DECODE_PWPOLICY_CONTROL.get(
                    String.valueOf(e));
            LocalizableMessage message = ERR_LDAPPWMOD_CANNOT_DECODE_PWPOLICY_CONTROL.get(e);
            err.println(wrapText(message, MAX_LINE_WIDTH));
          }
        }

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

@@ -180,14 +180,11 @@
                        EntryChangeNotificationControl.DECODER
                        .decode(c.isCritical(), ((LDAPControl) c).getValue());

                      out.println(INFO_LDAPSEARCH_PSEARCH_CHANGE_TYPE.get(
                              ecn.getChangeType().toString()));
                      out.println(INFO_LDAPSEARCH_PSEARCH_CHANGE_TYPE.get(ecn.getChangeType()));
                      DN previousDN = ecn.getPreviousDN();
                      if (previousDN != null)
                      {

                        out.println(INFO_LDAPSEARCH_PSEARCH_PREVIOUS_DN.get(
                                previousDN.toString()));
                        out.println(INFO_LDAPSEARCH_PSEARCH_PREVIOUS_DN.get(previousDN));
                      }
                    } catch (Exception e) {}
                  }

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

@@ -296,7 +296,6 @@
   */
  public static String getMessageForConnectionException(ASN1Exception ae)
  {
    String msg;
    Throwable cause = ae.getCause();
    if (cause != null)
    {
@@ -308,19 +307,10 @@
      }
      if (isTimeout)
      {
        msg = ERR_CLIENT_SIDE_TIMEOUT.get(
            ae.getMessageObject().toString()).toString();
      }
      else
      {
        msg = ae.getMessageObject().toString();
        return ERR_CLIENT_SIDE_TIMEOUT.get(ae.getMessageObject()).toString();
      }
    }
    else
    {
      msg = ae.getMessageObject().toString();
    }
    return msg;
    return ae.getMessageObject().toString();
  }
}


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

@@ -374,18 +374,14 @@
        String id = baseToIDMap.get(dn);
        if (id == null)
        {
          LocalizableMessage message = INFO_LISTBACKENDS_NOT_BASE_DN.get(
                  dn.toString());
          out.println(message);
          out.println(INFO_LISTBACKENDS_NOT_BASE_DN.get(dn));

          DN parentDN = dn.parent();
          while (true)
          {
            if (parentDN == null)
            {
              message = INFO_LISTBACKENDS_NO_BACKEND_FOR_DN.get(
                      dn.toString());
              out.println(message);
              out.println(INFO_LISTBACKENDS_NO_BACKEND_FOR_DN.get(dn));
              invalidDn = true;
              break;
            }
@@ -394,9 +390,7 @@
              id = baseToIDMap.get(parentDN);
              if (id != null)
              {
                message = INFO_LISTBACKENDS_DN_BELOW_BASE.get(
                        dn.toString(), parentDN.toString(), id);
                out.println(message);
                out.println(INFO_LISTBACKENDS_DN_BELOW_BASE.get(dn, parentDN, id));
                break;
              }
            }
@@ -406,9 +400,7 @@
        }
        else
        {
          LocalizableMessage message = INFO_LISTBACKENDS_BASE_FOR_ID.get(
                  dn.toString(), id);
          out.println(message);
          out.println(INFO_LISTBACKENDS_BASE_FOR_ID.get(dn, id));
        }
      }
    }

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

@@ -557,10 +557,8 @@
        }


        message = INFO_RESTOREDB_LIST_DEPENDENCIES.get(
                dependencyList.toString());
        message = INFO_RESTOREDB_LIST_DEPENDENCIES.get(dependencyList);
        out.println(message);

        out.println();
      }


 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java

@@ -1180,8 +1180,7 @@
      }
      catch (IOException ioe)
      {
        println(ERR_DSCFG_ERROR_WRITING_EQUIVALENT_COMMAND_LINE.get(file,
            ioe.toString()));
        println(ERR_DSCFG_ERROR_WRITING_EQUIVALENT_COMMAND_LINE.get(file, ioe));
      }
    }
  }

 opendj3-server-dev/src/server/org/opends/server/tools/dsreplication/ReplicationCliMain.java

@@ -3702,7 +3702,7 @@
            println(
                ERR_REPLICATION_STATUS_READING_REGISTERED_SERVERS.get(
                    Utils.getMessageFromCollection(exceptionMsgs,
                        Constants.LINE_SEPARATOR).toString()));
                        Constants.LINE_SEPARATOR)));
            println();
          }
          else
@@ -3712,7 +3712,7 @@
              cancelled = !askConfirmation(
              ERR_REPLICATION_READING_REGISTERED_SERVERS_CONFIRM_UPDATE_REMOTE.
                  get(Utils.getMessageFromCollection(exceptionMsgs,
                      Constants.LINE_SEPARATOR).toString()), true, logger);
                      Constants.LINE_SEPARATOR)), true, logger);
            }
            catch (CLIException ce)
            {
@@ -5604,7 +5604,7 @@
      {
        println(ERR_REPLICATION_READING_REGISTERED_SERVERS_WARNING.get(
                Utils.getMessageFromCollection(messages,
                    Constants.LINE_SEPARATOR).toString()));
                    Constants.LINE_SEPARATOR)));
      }
    }
    // Check whether there is more than one replication server in the
@@ -6335,7 +6335,7 @@
        println(
            ERR_REPLICATION_READING_REGISTERED_SERVERS_WARNING.get(
                Utils.getMessageFromCollection(messages,
                    Constants.LINE_SEPARATOR).toString()));
                    Constants.LINE_SEPARATOR)));
      }
    }

@@ -6837,7 +6837,7 @@
        LocalizableMessage msg =
            ERR_REPLICATION_STATUS_READING_REGISTERED_SERVERS.get(
                Utils.getMessageFromCollection(messages,
                    Constants.LINE_SEPARATOR).toString());
                    Constants.LINE_SEPARATOR));
        println(msg);
      }
    }
@@ -8019,8 +8019,7 @@
        {
          throw new ReplicationCliException(
              ERR_REPLICATION_INITIALIZING_TRIES_COMPLETED.get(
                  pnfe.getMessageObject().toString()),
              INITIALIZING_TRIES_COMPLETED, pnfe);
                  pnfe.getMessageObject()), INITIALIZING_TRIES_COMPLETED, pnfe);
        }
        try
        {
@@ -8079,8 +8078,7 @@
        {
          throw new ReplicationCliException(
              ERR_REPLICATION_INITIALIZING_TRIES_COMPLETED.get(
                  pnfe.getMessageObject().toString()),
              INITIALIZING_TRIES_COMPLETED, pnfe);
                  pnfe.getMessageObject()), INITIALIZING_TRIES_COMPLETED, pnfe);
        }
        try
        {
@@ -9394,9 +9392,7 @@
      }
      catch (IOException ioe)
      {
        println(
            ERR_REPLICATION_ERROR_WRITING_EQUIVALENT_COMMAND_LINE.get(file,
                ioe.toString()));
        println(ERR_REPLICATION_ERROR_WRITING_EQUIVALENT_COMMAND_LINE.get(file, ioe));
      }
    }
  }

 opendj3-server-dev/src/server/org/opends/server/tools/makeldif/Branch.java

@@ -223,9 +223,8 @@
             templates.get(toLowerCase(subordinateTemplateNames[i]));
        if (subordinateTemplates[i] == null)
        {
          LocalizableMessage message = ERR_MAKELDIF_UNDEFINED_BRANCH_SUBORDINATE.get(
              branchDN.toString(), subordinateTemplateNames[i]);
          throw new MakeLDIFException(message);
          throw new MakeLDIFException(ERR_MAKELDIF_UNDEFINED_BRANCH_SUBORDINATE.get(
              branchDN, subordinateTemplateNames[i]));
        }
      }
    }

 opendj3-server-dev/src/server/org/opends/server/tools/status/StatusCli.java

@@ -406,8 +406,7 @@
            // This should not happen but this is useful information to
            // diagnose the error.
            println();
            println(INFO_ERROR_READING_SERVER_CONFIGURATION.get(
              ne.toString()));
            println(INFO_ERROR_READING_SERVER_CONFIGURATION.get(ne));
            return ErrorReturnCode.ERROR_READING_CONFIGURATION_WITH_LDAP.
              getReturnCode();
          } catch (ConfigReadException cre) {

 opendj3-server-dev/src/server/org/opends/server/tools/upgrade/Upgrade.java

@@ -573,9 +573,8 @@
    // The upgrade only supports version >= 2.4.5.
    if (context.getFromVersion().compareTo(UPGRADESUPPORTSVERSIONFROM) < 0)
    {
      final LocalizableMessage message =
          INFO_UPGRADE_VERSION_IS_NOT_SUPPORTED.get(UPGRADESUPPORTSVERSIONFROM
              .toString(), UPGRADESUPPORTSVERSIONFROM.toString());
      final LocalizableMessage message = INFO_UPGRADE_VERSION_IS_NOT_SUPPORTED.get(
              UPGRADESUPPORTSVERSIONFROM, UPGRADESUPPORTSVERSIONFROM);
      context.notify(message, NOTICE_CALLBACK);
      throw new ClientException(EXIT_CODE_ERROR, message);
    }
@@ -604,9 +603,8 @@
      // Write the new version
      buildInfo.write(context.getToVersion().toString());

      context.notify(INFO_UPGRADE_SUCCESSFUL.get(context.getFromVersion()
          .toString(), context.getToVersion().toString()), TITLE_CALLBACK);

      context.notify(INFO_UPGRADE_SUCCESSFUL.get(
          context.getFromVersion(), context.getToVersion()), TITLE_CALLBACK);
    }
    catch (IOException e)
    {

 opendj3-server-dev/src/server/org/opends/server/tools/upgrade/UpgradeCli.java

@@ -470,9 +470,9 @@
            == ConfirmationCallback.YES_NO_CANCEL_OPTION)
        {
          choices.addAll(yesNoDefaultResponses);
          choices.addAll(StaticUtils
              .arrayToList(new String[] { INFO_TASKINFO_CMD_CANCEL_CHAR.get()
                  .toString() }));
          choices.addAll(StaticUtils.arrayToList(
              new String[] { INFO_TASKINFO_CMD_CANCEL_CHAR.get().toString() }
          ));

          prompt.append(" ")
                .append("(").append(INFO_PROMPT_YES_COMPLETE_ANSWER.get())

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

@@ -575,10 +575,8 @@
      // that would be invalid.
      if (dnReader.remaining() <= 0)
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(
            dnString.toString(), attributeName.toString());
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, attributeName));
      }


@@ -593,10 +591,8 @@
        // This means that we hit the end of the value before
        // finding a '='.  This is illegal because there is no
        // attribute-value separator.
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(
            dnString.toString(), attributeName.toString());
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
            message);
            ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, attributeName));
      }

      // The next character must be an equal sign.  If it is not,
@@ -702,10 +698,9 @@
      {
        // This should not happen.  At any rate, it's an illegal
        // character, so throw an exception.
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_CHAR.get(
            dnReader.toString(), (char) b, dnReader.position()-1);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_INVALID_CHAR.get(
                dnReader, (char) b, dnReader.position()-1));
      }


@@ -730,10 +725,8 @@
        // because that would be invalid.
        if (b == ' ')
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(
              dnString.toString(), attributeName.toString());
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, attributeName));
        }


@@ -859,10 +852,9 @@
        {
          // This should not happen.  At any rate, it's an illegal
          // character, so throw an exception.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_CHAR.get(
              dnString.toString(), (char) b, dnReader.position()-1);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
              message);
              ERR_ATTR_SYNTAX_DN_INVALID_CHAR.get(
                  dnString, (char) b, dnReader.position()-1));
        }
      }
    }
@@ -934,10 +926,8 @@
      // that would be invalid.
      if (pos >= length)
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(
            dnString, attributeName.toString());
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, attributeName));
      }


@@ -952,10 +942,8 @@
          // This means that we hit the end of the value before
          // finding a '='.  This is illegal because there is no
          // attribute-value separator.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(
              dnString, attributeName.toString());
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, attributeName));
        }
        else
        {
@@ -972,10 +960,8 @@
      }
      else
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(
            dnString, attributeName.toString(), c);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(dnString, attributeName, c));
      }


@@ -1103,10 +1089,8 @@
        // because that would be invalid.
        if (pos >= length)
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(
              dnString, attributeName.toString());
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DN_END_WITH_ATTR_NAME.get(dnString, attributeName));
        }


@@ -1139,10 +1123,8 @@
        }
        else
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(
              dnString, attributeName.toString(), c);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DN_NO_EQUAL.get(dnString, attributeName, c));
        }


@@ -1279,10 +1261,8 @@
      // know that there is at least one RDN component, and
      // therefore the last non-space character of the DN must
      // have been a comma. This is not acceptable.
      LocalizableMessage message = ERR_ATTR_SYNTAX_DN_END_WITH_COMMA.get(
          dnBytes.toString());
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
          message);
          ERR_ATTR_SYNTAX_DN_END_WITH_COMMA.get(dnBytes));
    }

    dnBytes.skip(-1);
@@ -1326,10 +1306,7 @@
        case ',':
          // None of these are allowed in an attribute name or any
          // character immediately following it.
          LocalizableMessage msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
              dnBytes.toString(), (char) b, dnBytes.position()-1);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       msg);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, invalidChar(dnBytes, b));


        case '-':
@@ -1337,8 +1314,8 @@
          // character in the attribute name.
          if (dnBytes.position() == nameStartPos + 1)
          {
            msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_INITIAL_DASH.get(dnBytes);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, msg);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_INITIAL_DASH.get(dnBytes));
          }
          break;

@@ -1354,10 +1331,7 @@
        case '/':
          // This is not allowed in an attribute name or any character
          // immediately following it.
          msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
              dnBytes.toString(), (char) b, dnBytes.position()-1);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       msg);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, invalidChar(dnBytes, b));


        case '0':
@@ -1383,10 +1357,7 @@
        case '<':
          // None of these are allowed in an attribute name or any
          // character immediately following it.
          msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
              dnBytes.toString(), (char) b, dnBytes.position()-1);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       msg);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, invalidChar(dnBytes, b));


        case '=':
@@ -1400,10 +1371,7 @@
        case '@':
          // None of these are allowed in an attribute name or any
          // character immediately following it.
          msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
              dnBytes.toString(), (char) b, dnBytes.position()-1);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       msg);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, invalidChar(dnBytes, b));


        case 'A':
@@ -1442,10 +1410,7 @@
        case '^':
          // None of these are allowed in an attribute name or any
          // character immediately following it.
          msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
              dnBytes.toString(), (char) b, dnBytes.position()-1);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       msg);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, invalidChar(dnBytes, b));


        case '_':
@@ -1454,15 +1419,15 @@
          // name exceptions option is enabled.
          if (dnBytes.position() == nameStartPos + 1)
          {
            msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_INITIAL_UNDERSCORE.
                  get(dnBytes, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, msg);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_INITIAL_UNDERSCORE.get(
                    dnBytes, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS));
          }
          else if (!allowExceptions)
          {
            msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_UNDERSCORE_CHAR.
                  get(dnBytes, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, msg);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_UNDERSCORE_CHAR.get(
                    dnBytes, ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS));
          }
          break;

@@ -1470,10 +1435,7 @@
        case '`':
          // This is not allowed in an attribute name or any character
          // immediately following it.
          msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
              dnBytes.toString(), (char) b, dnBytes.position()-1);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       msg);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, invalidChar(dnBytes, b));


        case 'a':
@@ -1509,10 +1471,7 @@
        default:
          // This is not allowed in an attribute name or any character
          // immediately following it.
          msg = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
              dnBytes.toString(), (char) b, dnBytes.position()-1);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       msg);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, invalidChar(dnBytes, b));
      }


@@ -1607,10 +1566,8 @@

      if (! validOID)
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_PERIOD.get(
            dnBytes.toString(), nameBytes.toString());
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_PERIOD.get(dnBytes, nameBytes));
      }
    }
    else if (isDigit((char)nameBytes.byteAt(0)) && (!allowExceptions))
@@ -1624,6 +1581,11 @@
    return nameBytes;
  }

  private static LocalizableMessage invalidChar(ByteSequenceReader dnBytes, byte b)
  {
    return ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(
        dnBytes, (char) b, dnBytes.position()-1);
  }


  /**
@@ -2006,13 +1968,10 @@
        validOID = false;
      }


      if (! validOID)
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_PERIOD.get(
            dnString, attributeName.toString());
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_PERIOD.get(dnString, attributeName));
      }
    }
    else if (isDigit(attributeName.charAt(0)) &&
@@ -2021,11 +1980,9 @@
      LocalizableMessage message = ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_INITIAL_DIGIT.
          get(dnString, attributeName.charAt(0),
              ATTR_ALLOW_ATTRIBUTE_NAME_EXCEPTIONS);
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                   message);
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
    }


    return pos;
  }

@@ -2065,10 +2022,8 @@
      StringBuilder hexString = new StringBuilder();
      if (dnBytes.remaining() < 2)
      {
        LocalizableMessage message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(
            dnBytes.toString());
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                     message);
            ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(dnBytes));
      }

      for (int i=0; i < 2; i++)
@@ -2080,10 +2035,8 @@
        }
        else
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(
              dnBytes.toString(), (char) b);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(dnBytes, (char) b));
        }
      }

@@ -2107,15 +2060,14 @@
            }
            else
            {
              LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.
                  get(dnBytes, (char) b);
              throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
              throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                  ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(dnBytes, (char) b));
            }
          }
          else
          {
            LocalizableMessage message = ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(dnBytes);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
            throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(dnBytes));
          }
        }
        else if ((b == ' ') || (b == ',') || (b == ';') || (b == '+'))
@@ -2126,10 +2078,8 @@
        }
        else
        {
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(
              dnBytes.toString(), (char) b);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(dnBytes, (char) b));
        }
      }

@@ -2139,15 +2089,14 @@
      // octet string.
      try
      {
        return ByteString.wrap(hexStringToByteArray(
                                     hexString.toString()));
        return ByteString.wrap(hexStringToByteArray(hexString.toString()));
      }
      catch (Exception e)
      {
        logger.traceException(e);

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

@@ -2165,10 +2114,8 @@
        {
          // We hit the end of the DN before the closing quote.
          // That's an error.
          LocalizableMessage message = ERR_ATTR_SYNTAX_DN_UNMATCHED_QUOTE.get(
              dnBytes.toString());
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
              ERR_ATTR_SYNTAX_DN_UNMATCHED_QUOTE.get(dnBytes));
        }

        if (dnBytes.get() == '"')
@@ -2180,8 +2127,7 @@

      int valueEndPos = dnBytes.position();
      dnBytes.position(valueStartPos);
      ByteString bs =
          dnBytes.getByteString(valueEndPos - valueStartPos - 1);
      ByteString bs = dnBytes.getByteString(valueEndPos - valueStartPos - 1);
      dnBytes.skip(1);
      return bs;
    }
@@ -2191,11 +2137,8 @@
      //We don't allow an empty attribute value. So do not allow the
      // first character to be a '+' or ',' since it is not escaped
      // by the user.
      LocalizableMessage message =
             ERR_ATTR_SYNTAX_DN_INVALID_REQUIRES_ESCAPE_CHAR.get(
                      dnBytes.toString(),dnBytes.position());
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
                                       message);
          ERR_ATTR_SYNTAX_DN_INVALID_REQUIRES_ESCAPE_CHAR.get(dnBytes, dnBytes.position()));
    }

    // Otherwise, use general parsing to find the end of the value.

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

@@ -600,9 +600,8 @@
    // that would be invalid.
    if (pos >= length)
    {
      LocalizableMessage message = ERR_RDN_END_WITH_ATTR_NAME.get(
          rdnString, attributeName.toString());
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
          ERR_RDN_END_WITH_ATTR_NAME.get(rdnString, attributeName));
    }


@@ -615,9 +614,8 @@
      {
        // This means that we hit the end of the string before finding a '='.
        // This is illegal because there is no attribute-value separator.
        LocalizableMessage message = ERR_RDN_END_WITH_ATTR_NAME.get(
            rdnString, attributeName.toString());
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
            ERR_RDN_END_WITH_ATTR_NAME.get(rdnString, attributeName));
      }
      else
      {
@@ -634,9 +632,8 @@
    }
    else
    {
      LocalizableMessage message = ERR_RDN_NO_EQUAL.get(
          rdnString, attributeName.toString(), c);
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
      throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
          ERR_RDN_NO_EQUAL.get(rdnString, attributeName, c));
    }


@@ -739,9 +736,8 @@
      // Make sure we're not at the end of the RDN.
      if (pos >= length)
      {
        LocalizableMessage message = ERR_RDN_END_WITH_ATTR_NAME.get(
            rdnString, attributeName.toString());
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
            ERR_RDN_END_WITH_ATTR_NAME.get(rdnString, attributeName));
      }


@@ -754,9 +750,8 @@
        {
          // This means that we hit the end of the string before finding a '='.
          // This is illegal because there is no attribute-value separator.
          LocalizableMessage message = ERR_RDN_END_WITH_ATTR_NAME.get(
              rdnString, attributeName.toString());
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
          throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
              ERR_RDN_END_WITH_ATTR_NAME.get(rdnString, attributeName));
        }
        else
        {
@@ -772,9 +767,8 @@
      }
      else
      {
        LocalizableMessage message = ERR_RDN_NO_EQUAL.get(
            rdnString, attributeName.toString(), c);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX, message);
        throw new DirectoryException(ResultCode.INVALID_DN_SYNTAX,
            ERR_RDN_NO_EQUAL.get(rdnString, attributeName, c));
      }



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

@@ -2329,11 +2329,8 @@

      default:
        // This is an invalid filter type.
        LocalizableMessage message = ERR_SEARCH_FILTER_INVALID_FILTER_TYPE.
            get(String.valueOf(entry.getName()), toString(),
                filterType.toString());
        throw new DirectoryException(ResultCode.PROTOCOL_ERROR,
                                     message);
            ERR_SEARCH_FILTER_INVALID_FILTER_TYPE.get(entry.getName(), this, filterType));
    }
  }


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

@@ -659,7 +659,7 @@
        catch (Exception e)
        {
          System.err.println(ERR_BASE64_CANNOT_READ_RAW_DATA.get(
                                  getExceptionMessage(e)).toString());
                                  getExceptionMessage(e)));
          System.exit(1);
        }
      }
@@ -678,7 +678,7 @@
        catch (Exception e)
        {
          System.err.println(ERR_BASE64_CANNOT_WRITE_ENCODED_DATA.get(
                                  getExceptionMessage(e)).toString());
                                  getExceptionMessage(e)));
          System.exit(1);
        }
      }
@@ -737,7 +737,7 @@
        catch (Exception e)
        {
          System.err.println(ERR_BASE64_CANNOT_READ_ENCODED_DATA.get(
                                  getExceptionMessage(e)).toString());
                                  getExceptionMessage(e)));
          System.exit(1);
        }
      }
@@ -772,14 +772,14 @@
      catch (Exception e)
      {
        System.err.println(ERR_BASE64_CANNOT_WRITE_RAW_DATA.get(
                                getExceptionMessage(e)).toString());
                                getExceptionMessage(e)));
        System.exit(1);
      }
    }
    else
    {
      System.err.println(ERR_BASE64_UNKNOWN_SUBCOMMAND.get(
                              subCommand.getName()).toString());
                              subCommand.getName()));
      System.exit(1);
    }
  }

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

@@ -22,9 +22,8 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions copyright 2013 ForgeRock AS.
 *      Portions copyright 2013-2014 ForgeRock AS.
 */

package org.opends.server.util;

import static org.opends.messages.ToolMessages.ERR_BUILDVERSION_NOT_FOUND;
@@ -134,8 +133,7 @@
        BuildVersion.instanceVersion().toString()))
    {
      throw new InitializationException(ERR_BUILDVERSION_MISMATCH.get(
          BuildVersion.binaryVersion().toString(), BuildVersion
              .instanceVersion().toString()));
          BuildVersion.binaryVersion(), BuildVersion.instanceVersion()));
    }
  }


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

@@ -404,9 +404,7 @@
        if (! entry.conformsToSchema(null, false, true, false, invalidReason))
        {
          LocalizableMessage message = ERR_LDIF_SCHEMA_VIOLATION.get(
                  String.valueOf(entryDN),
                  lastEntryLineNumber,
                  invalidReason.toString());
              entryDN, lastEntryLineNumber, invalidReason);
          logToRejectWriter(lines, message);
          suffix.removePending(entryDN);
          continue;
@@ -590,9 +588,7 @@
        if (! entry.conformsToSchema(null, false, true, false, invalidReason))
        {
          LocalizableMessage message = ERR_LDIF_SCHEMA_VIOLATION.get(
                  String.valueOf(entryDN),
                  lastEntryLineNumber,
                  invalidReason.toString());
              entryDN, lastEntryLineNumber, invalidReason);
          logToRejectWriter(lines, message);
          throw new LDIFException(message, lastEntryLineNumber, true);
        }
@@ -921,8 +917,7 @@
      }

      LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
              lastEntryLineNumber, line.toString(),
              de.getMessageObject());
          lastEntryLineNumber, line, de.getMessageObject());

      logToRejectWriter(lines, message);
      throw new LDIFException(message, lastEntryLineNumber, true, de);
@@ -934,8 +929,7 @@
        logger.trace("DN decode failed for: ", dnString);
      }
      LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
              lastEntryLineNumber, line.toString(),
              String.valueOf(e));
          lastEntryLineNumber, line, e);

      logToRejectWriter(lines, message);
      throw new LDIFException(message, lastEntryLineNumber, true, e);
@@ -968,8 +962,7 @@
    int colonPos = line.indexOf(":");
    if (colonPos <= 0)
    {
      LocalizableMessage message = ERR_LDIF_NO_ATTR_NAME.get(
              lastEntryLineNumber, line.toString());
      LocalizableMessage message = ERR_LDIF_NO_ATTR_NAME.get(lastEntryLineNumber, line);
      logToRejectWriter(lines, message);
      throw new LDIFException(message, lastEntryLineNumber, true);
    }
@@ -1120,9 +1113,7 @@
        if (! attrType.getSyntax().valueIsAcceptable(value, invalidReason))
        {
          LocalizableMessage message = WARN_LDIF_VALUE_VIOLATES_SYNTAX.get(
                  String.valueOf(entryDN),
                  lastEntryLineNumber, value.toString(),
                  attrName, invalidReason.toString());
              entryDN, lastEntryLineNumber, value, attrName, invalidReason);
          if (DirectoryServer.getSyntaxEnforcementPolicy() ==
                   AcceptRejectWarn.WARN)
          {
@@ -1166,9 +1157,7 @@
          if (!a.add(attributeValue) && checkSchema)
          {
              LocalizableMessage message = WARN_LDIF_DUPLICATE_ATTR.get(
                      String.valueOf(entryDN),
                      lastEntryLineNumber, attrName,
                      value.toString());
                  entryDN, lastEntryLineNumber, attrName, value);
              logToRejectWriter(lines, message);
            throw new LDIFException(message, lastEntryLineNumber, true);
          }
@@ -1484,7 +1473,7 @@
    {
      logger.traceException(de);
      LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
          lineNumber, line.toString(), de.getMessageObject());
          lineNumber, line, de.getMessageObject());
      throw new LDIFException(message, lineNumber, true);
    } catch (Exception e)
    {
@@ -1536,13 +1525,13 @@
      {
        logger.traceException(de);
        LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
            lineNumber, line.toString(), de.getMessageObject());
            lineNumber, line, de.getMessageObject());
        throw new LDIFException(message, lineNumber, true);
      } catch (Exception e)
      {
        logger.traceException(e);
        LocalizableMessage message = ERR_LDIF_INVALID_DN.get(
            lineNumber, line.toString(), e.getMessage());
            lineNumber, line, e.getMessage());
        throw new LDIFException(message, lineNumber, true);
      }
    }
@@ -1740,7 +1729,7 @@
    if (colonPos <= 0)
    {
      LocalizableMessage message = ERR_LDIF_NO_ATTR_NAME.get(
              lastEntryLineNumber, line.toString());
              lastEntryLineNumber, line);
      logToRejectWriter(lines, message);
      throw new LDIFException(message, lastEntryLineNumber, true);
    }

 opendj3-server-dev/src/server/org/opends/server/util/args/ArgumentParser.java

@@ -908,7 +908,7 @@
          if (! a.valueIsAcceptable(argValue, invalidReason))
          {
            LocalizableMessage message = ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_LONG_ID.get(
                argValue, origArgName, invalidReason.toString());
                argValue, origArgName, invalidReason);
            throw new ArgumentException(message);
          }

@@ -1023,19 +1023,15 @@
          LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
          if (! a.valueIsAcceptable(argValue, invalidReason))
          {
            LocalizableMessage message = ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_SHORT_ID.
                get(argValue, String.valueOf(argCharacter),
                    invalidReason.toString());
            throw new ArgumentException(message);
            throw new ArgumentException(ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_SHORT_ID.get(
                argValue, argCharacter, invalidReason));
          }

          // If the argument already has a value, then make sure it is
          // acceptable to have more than one.
          if (a.hasValue() && !a.isMultiValued())
          {
            LocalizableMessage message = ERR_ARGPARSER_NOT_MULTIVALUED_FOR_SHORT_ID.get(
                String.valueOf(argCharacter));
            throw new ArgumentException(message);
            throw new ArgumentException(ERR_ARGPARSER_NOT_MULTIVALUED_FOR_SHORT_ID.get(argCharacter));
          }

          a.addValue(argValue);

 opendj3-server-dev/src/server/org/opends/server/util/args/SubCommandArgumentParser.java

@@ -1017,19 +1017,15 @@
          LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder();
          if (! a.valueIsAcceptable(argValue, invalidReason))
          {
            LocalizableMessage message = ERR_SUBCMDPARSER_VALUE_UNACCEPTABLE_FOR_SHORT_ID.
                get(argValue, String.valueOf(argCharacter),
                    invalidReason.toString());
            throw new ArgumentException(message);
            throw new ArgumentException(ERR_SUBCMDPARSER_VALUE_UNACCEPTABLE_FOR_SHORT_ID.get(
                argValue, argCharacter, invalidReason));
          }

          // If the argument already has a value, then make sure it is
          // acceptable to have more than one.
          if (a.hasValue() && !a.isMultiValued())
          {
            LocalizableMessage message = ERR_SUBCMDPARSER_NOT_MULTIVALUED_FOR_SHORT_ID.get(
                String.valueOf(argCharacter));
            throw new ArgumentException(message);
            throw new ArgumentException(ERR_SUBCMDPARSER_NOT_MULTIVALUED_FOR_SHORT_ID.get(argCharacter));
          }

          a.addValue(argValue);

 opendj3-server-dev/src/server/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java

@@ -1517,18 +1517,16 @@
    {
      // Certificate DN
      app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_USER_DN.get(
          chain[i].getSubjectDN().toString()));
          chain[i].getSubjectDN()));

      // certificate validity
      app.println(
          INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_VALIDITY.get(
              chain[i].getNotBefore().toString(),
              chain[i].getNotAfter().toString()));
      app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_VALIDITY.get(
          chain[i].getNotBefore(),
          chain[i].getNotAfter()));

      // certificate Issuer
      app.println(
          INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER.get(
              chain[i].getIssuerDN().toString()));
      app.println(INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER.get(
          chain[i].getIssuerDN()));

      if (i+1 <chain.length)
      {

 opendj3-server-dev/src/server/org/opends/server/workflowelement/WorkflowElementConfigManager.java

@@ -461,10 +461,8 @@
            }
          }

          LocalizableMessage message =
            ERR_CONFIG_WORKFLOW_ELEMENT_CONFIG_NOT_ACCEPTABLE.get(
              String.valueOf(configuration.dn()), buffer.toString());
          throw new InitializationException(message);
          throw new InitializationException(
              ERR_CONFIG_WORKFLOW_ELEMENT_CONFIG_NOT_ACCEPTABLE.get(configuration.dn(), buffer));
        }
      }


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

@@ -1085,7 +1085,7 @@
              {
                message = WARN_ADD_OP_INVALID_SYNTAX.
                    get(String.valueOf(entryDN),
                        String.valueOf(v.getValue().toString()),
                        String.valueOf(v.getValue()),
                        String.valueOf(a.getName()),
                        String.valueOf(invalidReason));


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

@@ -1410,8 +1410,8 @@
            {
              throw newDirectoryException(currentEntry,
                  ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                  ERR_MODIFY_ADD_INVALID_SYNTAX.get(String.valueOf(entryDN),
                      attr.getName(), v.getValue().toString(), invalidReason));
                  ERR_MODIFY_ADD_INVALID_SYNTAX.get(
                      entryDN, attr.getName(), v.getValue(), invalidReason));
            }
          }
        }
@@ -1434,9 +1434,8 @@
            }
            else
            {
              logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX.get(String
                  .valueOf(entryDN), attr.getName(), v.getValue().toString(),
                  invalidReason));
              logger.error(ERR_MODIFY_ADD_INVALID_SYNTAX.get(
                  entryDN, attr.getName(), v.getValue(), invalidReason));
            }
            invalidReason = new LocalizableMessageBuilder();
          }
@@ -1622,7 +1621,7 @@
              throw newDirectoryException(currentEntry,
                  ResultCode.INVALID_ATTRIBUTE_SYNTAX,
                  ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(String.valueOf(entryDN),
                      attr.getName(), v.getValue().toString(), invalidReason));
                      attr.getName(), v.getValue(), invalidReason));
            }
          }
        }
@@ -1644,7 +1643,7 @@
            else
            {
              logger.error(ERR_MODIFY_REPLACE_INVALID_SYNTAX.get(String
                  .valueOf(entryDN), attr.getName(), v.getValue().toString(),
                  .valueOf(entryDN), attr.getName(), v.getValue(),
                  invalidReason));
            }
            invalidReason = new LocalizableMessageBuilder();
@@ -1732,7 +1731,7 @@

      throw new DirectoryException(ResultCode.INVALID_ATTRIBUTE_SYNTAX,
          ERR_MODIFY_INCREMENT_PROVIDED_VALUE_NOT_INTEGER.get(String
              .valueOf(entryDN), attr.getName(), v.getValue().toString()), e);
              .valueOf(entryDN), attr.getName(), v.getValue()), e);
    }

    // Get the attribute that is to be incremented.
@@ -1763,7 +1762,7 @@
            ResultCode.INVALID_ATTRIBUTE_SYNTAX,
            ERR_MODIFY_INCREMENT_REQUIRES_INTEGER_VALUE.get(String
                .valueOf(entryDN), a.getName(),
                existingValue.getValue().toString()),
                existingValue.getValue()),
            e);
      }