Author: angela
Date: Wed Mar 25 11:42:59 2015
New Revision: 1669097
URL: http://svn.apache.org/r1669097
Log:
OAK-2674
Modified:
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapProviderConfig.java
Modified:
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapProviderConfig.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapProviderConfig.java?rev=1669097&r1=1669096&r2=1669097&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapProviderConfig.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapProviderConfig.java
Wed Mar 25 11:42:59 2015
@@ -557,7 +557,7 @@ public class LdapProviderConfig {
* Defines the configuration of a connection pool. Currently we only
define the max size.
* (documentation copied from {@link
org.apache.commons.pool.impl.GenericObjectPool})
*/
- public class PoolConfig {
+ public static class PoolConfig {
private int maxActiveSize;
@@ -609,9 +609,14 @@ public class LdapProviderConfig {
.setNoCertCheck(params.getConfigValue(PARAM_NO_CERT_CHECK,
PARAM_NO_CERT_CHECK_DEFAULT))
.setBindDN(params.getConfigValue(PARAM_BIND_DN,
PARAM_BIND_DN_DEFAULT))
.setBindPassword(params.getConfigValue(PARAM_BIND_PASSWORD,
PARAM_BIND_PASSWORD_DEFAULT))
-
.setSearchTimeout(ConfigurationParameters.Milliseconds.of(params.getConfigValue(PARAM_SEARCH_TIMEOUT,
PARAM_SEARCH_TIMEOUT_DEFAULT)).value)
.setGroupMemberAttribute(params.getConfigValue(PARAM_GROUP_MEMBER_ATTRIBUTE,
PARAM_GROUP_MEMBER_ATTRIBUTE_DEFAULT));
+ ConfigurationParameters.Milliseconds ms =
ConfigurationParameters.Milliseconds.of(params.getConfigValue(PARAM_SEARCH_TIMEOUT,
PARAM_SEARCH_TIMEOUT_DEFAULT));
+ if (ms != null) {
+ cfg.setSearchTimeout(ms.value);
+ }
+
+
cfg.getUserConfig()
.setBaseDN(params.getConfigValue(PARAM_USER_BASE_DN,
PARAM_USER_BASE_DN))
.setIdAttribute(params.getConfigValue(PARAM_USER_ID_ATTRIBUTE,
PARAM_USER_ID_ATTRIBUTE_DEFAULT))
