[java-shib-common COMMIT] /branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Aug 14 06:39:20 2013
New Revision: 1084

URL: http://svn.shibboleth.net/view/java-shib-common?rev=1084&view=rev
Log:
SIDP-591 retro fit warning when we didn't actually create an attribute from V3.

Modified:
    branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/ShibbolethAttributeResolver.java

Modified: branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/ShibbolethAttributeResolver.java
URL: http://svn.shibboleth.net/view/java-shib-common/branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/ShibbolethAttributeResolver.java?rev=1084&r1=1083&r2=1084&view=diff
==============================================================================
--- branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/ShibbolethAttributeResolver.java (original)
+++ branches/REL_1/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/resolver/provider/ShibbolethAttributeResolver.java Wed Aug 14 06:39:20 2013
@@ -438,6 +438,11 @@
 
             // remove dependency-only attributes
             attributeDefinition = getAttributeDefinitions().get(resolvedAttribute.getId());
+            if (null == attributeDefinition) {
+                log.warn("Attribute definition {} produced no attribute.", resolvedAttribute.getId());
+                continue;
+            }
+            
             if (attributeDefinition.isDependencyOnly()) {
                 log.debug("Removing dependency-only attribute {} from resolution result for principal {}.",
                         resolvedAttribute.getId(), resolutionContext.getAttributeRequestContext().getPrincipalName());