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

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Mar 14 22:43:33 2013
New Revision: 4333

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4333&view=rev
Log:
Set the id of the wrapped attribute resolver to the id of the attribute resolver service.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java?rev=4333&r1=4332&r2=4333&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverService.java Thu Mar 14 22:43:33 2013
@@ -66,6 +66,7 @@
 
         GenericApplicationContext appCtx = (GenericApplicationContext) context.get(APP_CTX_CTX_KEY);
 
+        // attribute definitions
         Map<String, BaseAttributeDefinition> adMap = appCtx.getBeansOfType(BaseAttributeDefinition.class);
         log.debug("Loading {} attribute definitions", adMap.size());
 
@@ -73,7 +74,7 @@
         Map<String, BaseDataConnector> dataConnectorMap = appCtx.getBeansOfType(BaseDataConnector.class);
         log.debug("Loading {} data connectors", dataConnectorMap.size());
 
-        attributeResolver = new AttributeResolver("resolverId", adMap.values(), dataConnectorMap.values());
+        attributeResolver = new AttributeResolver(getId(), adMap.values(), dataConnectorMap.values());
 
         try {
             attributeResolver.initialize();