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/crypto/CryptoManagerImpl.java |   33 ++++++++++++---------------------
 1 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java b/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
index 15b3248..b308725 100644
--- a/opendj3-server-dev/src/server/org/opends/server/crypto/CryptoManagerImpl.java
+++ b/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()));
       }
     }
 

--
Gitblit v1.10.0