[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolve...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Feb  9 05:52:53 2017
New Revision: 8613

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8613&view=rev
Log:
IDP-1113 in circularity checking look for attributes before data connectors

https://issues.shibboleth.net/jira/browse/IDP-1113

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

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=8613&r1=8612&r2=8613&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  9 05:52:53 2017
@@ -543,9 +543,9 @@
                         + "' have a circular dependecy on each other.");
             }
 
-            dependencyPlugin = dataConnectors.get(dependency.getDependencyPluginId());
+            dependencyPlugin = attributeDefinitions.get(dependency.getDependencyPluginId());
             if (dependencyPlugin == null) {
-                dependencyPlugin = attributeDefinitions.get(dependency.getDependencyPluginId());
+                dependencyPlugin = dataConnectors.get(dependency.getDependencyPluginId());
             }
             if (dependencyPlugin == null) {
                 throw new ComponentInitializationException(logPrefix + " Plugin '" + plugin.getId()