From 31216400c324b43c15b8a9eea6d89604247ebb14 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 12:10:05 +0000
Subject: [PATCH] Removed now useless calls to String.valueOf() on arguments of ArgN.get(...).

---
 opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java b/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
index 4aa3205..3a91911 100644
--- a/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
+++ b/opendj3-server-dev/src/server/org/opends/server/extensions/PlainSASLMechanismHandler.java
@@ -244,8 +244,7 @@
       if (readLock == null)
       {
         bindOperation.setResultCode(ResultCode.BUSY);
-        bindOperation.setAuthFailureReason(INFO_SASLPLAIN_CANNOT_LOCK_ENTRY
-            .get(String.valueOf(userDN)));
+        bindOperation.setAuthFailureReason(INFO_SASLPLAIN_CANNOT_LOCK_ENTRY.get(userDN));
         return;
       }
 
@@ -259,9 +258,7 @@
 
         bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
 
-        LocalizableMessage message = ERR_SASLPLAIN_CANNOT_GET_ENTRY_BY_DN.get(
-                String.valueOf(userDN),
-                de.getMessageObject());
+        LocalizableMessage message = ERR_SASLPLAIN_CANNOT_GET_ENTRY_BY_DN.get(userDN, de.getMessageObject());
         bindOperation.setAuthFailureReason(message);
         return;
       }
@@ -288,9 +285,7 @@
 
         bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
 
-        LocalizableMessage message = ERR_SASLPLAIN_CANNOT_MAP_USERNAME.get(
-                String.valueOf(authcID),
-                de.getMessageObject());
+        LocalizableMessage message = ERR_SASLPLAIN_CANNOT_MAP_USERNAME.get(authcID, de.getMessageObject());
         bindOperation.setAuthFailureReason(message);
         return;
       }
@@ -354,8 +349,7 @@
           {
             bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
 
-            LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(
-                    String.valueOf(userEntry.getName()));
+            LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(userEntry.getName());
             bindOperation.setAuthFailureReason(message);
             return;
           }
@@ -373,8 +367,7 @@
               {
                 bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
 
-                LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_NO_SUCH_ENTRY.get(
-                        String.valueOf(authzDN));
+                LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_NO_SUCH_ENTRY.get(authzDN);
                 bindOperation.setAuthFailureReason(message);
                 return;
               }
@@ -385,9 +378,7 @@
 
               bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
 
-              LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_CANNOT_GET_ENTRY.get(
-                      String.valueOf(authzDN),
-                      de.getMessageObject());
+              LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_CANNOT_GET_ENTRY.get(authzDN, de.getMessageObject());
               bindOperation.setAuthFailureReason(message);
               return;
             }
@@ -450,8 +441,7 @@
           {
             bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
 
-            LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(
-                    String.valueOf(userEntry.getName()));
+            LocalizableMessage message = ERR_SASLPLAIN_AUTHZID_INSUFFICIENT_PRIVILEGES.get(userEntry.getName());
             bindOperation.setAuthFailureReason(message);
             return;
           }
@@ -493,9 +483,7 @@
 
       bindOperation.setResultCode(ResultCode.INVALID_CREDENTIALS);
 
-      LocalizableMessage message = ERR_SASLPLAIN_CANNOT_CHECK_PASSWORD_VALIDITY.get(
-              String.valueOf(userEntry.getName()),
-              String.valueOf(e));
+      LocalizableMessage message = ERR_SASLPLAIN_CANNOT_CHECK_PASSWORD_VALIDITY.get(userEntry.getName(), e);
       bindOperation.setAuthFailureReason(message);
       return;
     }

--
Gitblit v1.10.0