From a1f030edc5d19b575470f0d79033d9f7471ab172 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 31 Jan 2014 14:49:58 +0000
Subject: [PATCH] Removed now useless calls to .toString() on arguments of ArgN.get(...).

---
 opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java |   33 +++++++++++----------------------
 1 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java b/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
index bd38672..8526150 100644
--- a/opendj3-server-dev/src/server/org/opends/server/util/LDIFReader.java
+++ b/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);
     }

--
Gitblit v1.10.0