[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 Feb 15 06:00:51 2014
New Revision: 5387

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5387&view=rev
Log:
IDP-354 nonpooled connections pass the bena definition, not its builder.

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java?rev=5387&r1=5386&r2=5387&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LdapDataConnectorParser.java Sat Feb 15 06:00:51 2014
@@ -17,9 +17,9 @@
 
 package net.shibboleth.idp.attribute.resolver.spring.dc.ldap;
 
-import java.util.List;
 import java.security.PrivateKey;
 import java.security.cert.X509Certificate;
+import java.util.List;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -84,11 +84,13 @@
     private final Logger log = LoggerFactory.getLogger(LdapDataConnectorParser.class);
 
     /** {@inheritDoc} */
+    @Override
     protected Class<LdapDataConnector> getBeanClass(@Nullable final Element element) {
         return LdapDataConnector.class;
     }
 
     /** {@inheritDoc} */
+    @Override
     protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
         super.doParse(config, parserContext, builder);
@@ -177,7 +179,7 @@
             pooledConnectionFactory.addConstructorArgValue(connectionPool);
             builder.addPropertyValue("connectionFactory", pooledConnectionFactory.getBeanDefinition());
         } else {
-            builder.addPropertyValue("connectionFactory", connectionFactory);
+            builder.addPropertyValue("connectionFactory", connectionFactory.getBeanDefinition());
         }
 
         final BeanDefinition searchExecutor = v2Parser.createSearchExecutor();