From 5c8112fb478d7706c2c6a6fd46428584145cadc8 Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 08 Aug 2007 14:32:21 +0000
Subject: [PATCH] corrected duplicate ordinal values and argument replacement types

---
 opends/src/server/org/opends/server/messages/CoreMessages.java |   46 ++++++++++++++++++++++------------------------
 1 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/opends/src/server/org/opends/server/messages/CoreMessages.java b/opends/src/server/org/opends/server/messages/CoreMessages.java
index 3bb47e3..b823f4c 100644
--- a/opends/src/server/org/opends/server/messages/CoreMessages.java
+++ b/opends/src/server/org/opends/server/messages/CoreMessages.java
@@ -6306,28 +6306,6 @@
        CATEGORY_MASK_CORE | SEVERITY_MASK_INFORMATIONAL | 632;
 
 
-
-  /**
-   * The message ID for the message that will be used if an error occurred while
-   * trying to terminate a client connection.  It takes two arguments, which are
-   * the connection ID and a string representation of the exception that was
-   * caught.
-   */
-  public static final int MSGID_IDLETIME_DISCONNECT_ERROR =
-       CATEGORY_MASK_CORE | SEVERITY_MASK_MILD_ERROR | 632;
-
-
-
-  /**
-   * The message ID for the message that will be used if an unexpected error
-   * occurred in the time thread.  It takes a single argument, which is a string
-   * representation of the exception that was caught.
-   */
-  public static final int MSGID_IDLETIME_UNEXPECTED_ERROR =
-       CATEGORY_MASK_CORE | SEVERITY_MASK_SEVERE_ERROR | 632;
-
-
-
   /**
    * The message ID for the message that will be used if the maximum password
    * age is enabled, but the warning interval is longer than the maximum age.
@@ -6383,6 +6361,26 @@
 
 
   /**
+   * The message ID for the message that will be used if an error occurred while
+   * trying to terminate a client connection.  It takes two arguments, which are
+   * the connection ID and a string representation of the exception that was
+   * caught.
+   */
+  public static final int MSGID_IDLETIME_DISCONNECT_ERROR =
+       CATEGORY_MASK_CORE | SEVERITY_MASK_MILD_ERROR | 638;
+
+
+
+  /**
+   * The message ID for the message that will be used if an unexpected error
+   * occurred in the time thread.  It takes a single argument, which is a string
+   * representation of the exception that was caught.
+   */
+  public static final int MSGID_IDLETIME_UNEXPECTED_ERROR =
+       CATEGORY_MASK_CORE | SEVERITY_MASK_SEVERE_ERROR | 639;
+
+
+  /**
    * Associates a set of generic messages with the message IDs defined
    * in this class.
    */
@@ -6999,7 +6997,7 @@
                     "Unable to decode the provided string \"%s\" as a " +
                     "relative distinguished name because the first non-blank " +
                     "character after the attribute type %s was not an " +
-                    "equal sign (character read was %s)");
+                    "equal sign (character read was %c)");
     registerMessage(MSGID_RDN_UNEXPECTED_COMMA,
                     "Unable to decode the provided string \"%s\" as a " +
                     "relative distinguished name because it contained an " +
@@ -7008,7 +7006,7 @@
     registerMessage(MSGID_RDN_ILLEGAL_CHARACTER,
                     "Unable to decode the provided string \"%s\" as a " +
                     "relative distinguished name because an illegal " +
-                    "character %s was found at position %d, where either the " +
+                    "character %c was found at position %d, where either the " +
                     "end of the string or a '+' sign were expected");
 
 

--
Gitblit v1.10.0