[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb  5 11:08:58 2015
New Revision: 7314

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7314&view=rev
Log:
IDP-590 Moderate the logging if there is an activation condition.

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java?rev=7314&r1=7313&r2=7314&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractResolverPlugin.java Thu Feb  5 11:08:58 2015
@@ -186,7 +186,11 @@
         Constraint.isNotNull(workContext, "AttributeResolverWorkContext cannot be null");
 
         try {
-            return doResolve(resolutionContext, workContext);
+            final ResolvedType result = doResolve(resolutionContext, workContext);
+            if (null == result) {
+                log.info("Resolver plugin '{}' produced no value.", getId());
+            }
+            return result;
         } catch (ResolutionException e) {
             //
             // NOTE - if you change this logic you MUST make changes in any derived classes that

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java?rev=7314&r1=7313&r2=7314&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java Thu Feb  5 11:08:58 2015
@@ -267,7 +267,7 @@
         final IdPAttribute resolvedAttribute = definition.resolve(resolutionContext);
 
         if (null == resolvedAttribute) {
-            log.warn("{} Attribute definition '{}' produced no attribute", logPrefix, attributeId);
+            log.debug("{} Attribute definition '{}' produced no attribute", logPrefix, attributeId);
         } else {
             log.debug("{} Attribute definition '{}' produced an attribute with {} values", new Object[] {logPrefix,
                     attributeId, resolvedAttribute.getValues().size(),});