From 4a87d0ed96753944d40e2a7bc4fc64f342767649 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 04 Feb 2014 10:49:25 +0000
Subject: [PATCH] Factorized a lot of String joining code into Utils.joinAsString(). Removed unjustified uses of LocalizedMessageBuilder. Removed a few calls to String.valueOf() with arguments of LocalizableMessageBuilder.append().

---
 opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
index 1414d2a..409f8a8 100644
--- a/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
+++ b/opendj3-server-dev/src/server/org/opends/server/replication/plugin/LDAPReplicationDomain.java
@@ -3028,11 +3028,11 @@
         // log error and information for the REPAIR tool.
         LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
         mb.append(ERR_CANNOT_RENAME_CONFLICT_ENTRY.get());
-        mb.append(String.valueOf(entryDN));
+        mb.append(entryDN);
         mb.append(" ");
-        mb.append(String.valueOf(conflictOp));
+        mb.append(conflictOp);
         mb.append(" ");
-        mb.append(String.valueOf(op.getResultCode()));
+        mb.append(op.getResultCode());
         logger.error(mb.toMessage());
       }
     } catch (DirectoryException e)
@@ -3040,9 +3040,9 @@
       // log error and information for the REPAIR tool.
       LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
       mb.append(ERR_EXCEPTION_RENAME_CONFLICT_ENTRY.get());
-      mb.append(String.valueOf(entryDN));
+      mb.append(entryDN);
       mb.append(" ");
-      mb.append(String.valueOf(conflictOp));
+      mb.append(conflictOp);
       mb.append(" ");
       mb.append(stackTraceToSingleLineString(e));
       logger.error(mb.toMessage());
@@ -3075,11 +3075,11 @@
       // log information for the repair tool.
       LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
       mb.append(ERR_CANNOT_RENAME_CONFLICT_ENTRY.get());
-      mb.append(String.valueOf(dn));
+      mb.append(dn);
       mb.append(" ");
-      mb.append(String.valueOf(conflictOp));
+      mb.append(conflictOp);
       mb.append(" ");
-      mb.append(String.valueOf(newOp.getResultCode()));
+      mb.append(newOp.getResultCode());
       logger.error(mb.toMessage());
     }
   }
@@ -3114,9 +3114,9 @@
       // Log information for the repair tool.
       LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
       mb.append(ERR_CANNOT_ADD_CONFLICT_ATTRIBUTE.get());
-      mb.append(String.valueOf(op));
+      mb.append(op);
       mb.append(" ");
-      mb.append(String.valueOf(newOp.getResultCode()));
+      mb.append(newOp.getResultCode());
       logger.error(mb.toMessage());
     }
 
@@ -5152,9 +5152,9 @@
          // Log information for the repair tool.
          LocalizableMessageBuilder mb = new LocalizableMessageBuilder();
          mb.append(ERR_CANNOT_ADD_CONFLICT_ATTRIBUTE.get());
-         mb.append(String.valueOf(newOp));
+         mb.append(newOp);
          mb.append(" ");
-         mb.append(String.valueOf(newOp.getResultCode()));
+         mb.append(newOp.getResultCode());
          logger.error(mb.toMessage());
        }
        else if (task != null)

--
Gitblit v1.10.0