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

[noreply at shibboleth.net]

Author: dfisher
Date: Thu Jul 28 23:49:27 2016
New Revision: 8306

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8306&view=rev
Log:
IDP-1011 default baseDn

Use the default value of baseDn in the SearchExecutor if no baseDn is provided.

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

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/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/impl/LDAPDataConnectorParser.java?rev=8306&r1=8305&r2=8306&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java	(original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java	Thu Jul 28 23:49:27 2016
@@ -405,7 +405,9 @@
 
             final BeanDefinitionBuilder searchExecutor =
                     BeanDefinitionBuilder.genericBeanDefinition(SearchExecutor.class);
-            searchExecutor.addPropertyValue("baseDn", baseDn);
+            if (baseDn != null) {
+                searchExecutor.addPropertyValue("baseDn", baseDn);
+            }
             if (searchScope != null) {
                 searchExecutor.addPropertyValue("searchScope", searchScope);
             }