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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Jan 17 12:15:17 2015
New Revision: 7251

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7251&view=rev
Log:
IDP-571 Use Brents proposed change for the fix for the aliasing issue

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

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java?rev=7251&r1=7250&r2=7251&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/enc/BaseAttributeEncoderParser.java Sat Jan 17 12:15:17 2015
@@ -81,13 +81,9 @@
      * We do <em>not</em> want Spring to add aliases derived from {@literal #NAME_ATTRIBUTE_NAME} so strip them out 
      * from the registry. */
     @Override protected void registerBeanDefinition(BeanDefinitionHolder definition, BeanDefinitionRegistry registry) {
-        String[] aliases = definition.getAliases();
-        super.registerBeanDefinition(definition, registry);
-        if (aliases != null && aliases.length != 0) {
-            for (String alias : aliases) {
-                registry.removeAlias(alias);
-            }
-        }
+        // Register bean definition under primary name. Do *not* register the aliases.
+        String beanName = definition.getBeanName();
+        registry.registerBeanDefinition(beanName, definition.getBeanDefinition()); 
     }
 
     /** {@inheritDoc} */