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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar  7 21:03:11 2017
New Revision: 8667

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

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

Modified: branches/3.3/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.3/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java?rev=8667&r1=8666&r2=8667&view=diff
==============================================================================
--- branches/3.3/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	(original)
+++ branches/3.3/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	Tue Mar  7 21:03:11 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()