[java-identity-provider COMMIT] /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/Populat...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Feb 10 19:04:03 2016
New Revision: 8088

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8088&view=rev
Log:
Lower some logging, given the intent behind the encryption-optional property.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/PopulateEncryptionParameters.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/PopulateEncryptionParameters.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/PopulateEncryptionParameters.java?rev=8088&r1=8087&r2=8088&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/PopulateEncryptionParameters.java	(original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/PopulateEncryptionParameters.java	Wed Feb 10 19:04:03 2016
@@ -340,17 +340,18 @@
                     encryptCtx.setAttributeEncryptionParameters(params);
                 }
             } else {
-                log.warn("{} Resolver returned no EncryptionParameters", getLogPrefix());
                 if (encryptionOptional) {
-                    log.info("{} Encryption is optional, ignoring inability to encrypt", getLogPrefix());
+                    log.debug("{} Resolver returned no EncryptionParameters", getLogPrefix());
+                    log.debug("{} Encryption is optional, ignoring inability to encrypt", getLogPrefix());
                 } else {
+                    log.warn("{} Resolver returned no EncryptionParameters", getLogPrefix());
                     ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_SEC_CFG);
                 }
             }
         } catch (final ResolverException e) {
             log.error("{} Error resolving EncryptionParameters", getLogPrefix(), e);
             if (encryptionOptional) {
-                log.info("{} Encryption is optional, ignoring inability to encrypt", getLogPrefix());
+                log.debug("{} Encryption is optional, ignoring inability to encrypt", getLogPrefix());
             } else {
                 ActionSupport.buildEvent(profileRequestContext, EventIds.INVALID_SEC_CFG);
             }