[java-opensaml COMMIT] /trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jan 30 17:34:17 2015
New Revision: 4207

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4207&view=rev
Log:
Change SAML Encrypter to just use the class logger, rather than a special one for per-encryption.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java?rev=4207&r1=4206&r2=4207&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java Fri Jan 30 17:34:17 2015
@@ -147,9 +147,6 @@
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(Encrypter.class);
 
-    /** Pre-encryption logger. */
-    private final Logger logPreEncryption = LoggerFactory.getLogger("SAML_PRE_ENCRYPTION");
-
     /**
      * Constructor.
      * 
@@ -326,12 +323,12 @@
      * @param objectType String description of the type of object to encrypt
      */
     private void logPreEncryption(XMLObject xmlObject, String objectType) {
-        if (logPreEncryption.isDebugEnabled()) {
+        if (log.isDebugEnabled()) {
             try {
                 final Element dom = XMLObjectSupport.marshall(xmlObject);
-                logPreEncryption.debug("{} before encryption:\n{}", objectType, SerializeSupport.prettyPrintXML(dom));
+                log.debug("{} before encryption:\n{}", objectType, SerializeSupport.prettyPrintXML(dom));
             } catch (final MarshallingException e) {
-                logPreEncryption.error("Unable to marshall {} for logging purposes", objectType, e);
+                log.error("Unable to marshall {} for logging purposes", objectType, e);
             }
         }
     }