[java-identity-provider] branch master updated: IDP-1121 Rempve parsing of non available attributes

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=470c9fc65ad2a950d2a41b8b691d00e9e0ceb0a6

The following commit(s) were added to refs/heads/master by this push:
       new  470c9fc   IDP-1121 Rempve parsing of non available attributes
470c9fc is described below

commit 470c9fc65ad2a950d2a41b8b691d00e9e0ceb0a6
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Feb 11 17:08:12 2019 +0000

    IDP-1121 Rempve parsing of non available attributes
    
    https://issues.shibboleth.net/jira/browse/IDP-1121
    
    poolInitialSize and poolMaxIdleSize were only available in the
    old stle :dc namespace.  They were not deprecation warned on, but they
    were unspecifiable.
---
 .../spring/dc/ldap/impl/LDAPDataConnectorParser.java     | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 17d8ef8..27fae5b 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -624,24 +624,12 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
 
             final BeanDefinitionBuilder poolConfig = BeanDefinitionBuilder.genericBeanDefinition(PoolConfig.class);
             if (minPoolSize == null) {
-                final String poolInitialSize =
-                        AttributeSupport.getAttributeValue(configElement, new QName("poolInitialSize"));
-                if (poolInitialSize != null) {
-                    poolConfig.addPropertyValue("minPoolSize", poolInitialSize);
-                } else {
-                    poolConfig.addPropertyValue("minPoolSize", 0);
-                }
+                poolConfig.addPropertyValue("minPoolSize", 0);
             } else {
                 poolConfig.addPropertyValue("minPoolSize", minPoolSize);
             }
             if (maxPoolSize == null) {
-                final String poolMaxIdleSize =
-                        AttributeSupport.getAttributeValue(configElement, new QName("poolMaxIdleSize"));
-                if (poolMaxIdleSize != null) {
-                    poolConfig.addPropertyValue("maxPoolSize", poolMaxIdleSize);
-                } else {
-                    poolConfig.addPropertyValue("maxPoolSize", 3);
-                }
+                poolConfig.addPropertyValue("maxPoolSize", 3);
             } else {
                 poolConfig.addPropertyValue("maxPoolSize", maxPoolSize);
             }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.