You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2015/03/25 16:39:07 UTC
svn commit: r1669135 -
/jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
Author: angela
Date: Wed Mar 25 15:39:07 2015
New Revision: 1669135
URL: http://svn.apache.org/r1669135
Log:
OAK-2674 : Fix FindBug Issues with LdapIdentityProvider
Modified:
jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
Modified: jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java?rev=1669135&r1=1669134&r2=1669135&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java (original)
+++ jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java Wed Mar 25 15:39:07 2015
@@ -123,11 +123,12 @@ public class LdapIdentityProvider implem
* Constructor for non-OSGi cases.
* @param config the configuration
*/
- public LdapIdentityProvider(LdapProviderConfig config) {
+ public LdapIdentityProvider(@Nonnull LdapProviderConfig config) {
this.config = config;
init();
}
+ @SuppressWarnings("UnusedDeclaration")
@Activate
private void activate(Map<String, Object> properties) {
ConfigurationParameters cfg = ConfigurationParameters.of(properties);
@@ -135,6 +136,7 @@ public class LdapIdentityProvider implem
init();
}
+ @SuppressWarnings("UnusedDeclaration")
@Deactivate
private void deactivate() {
close();
@@ -150,8 +152,9 @@ public class LdapIdentityProvider implem
// setup admin connection pool
LdapConnectionConfig cc = createConnectionConfig();
- if (!config.getBindDN().isEmpty()) {
- cc.setName(config.getBindDN());
+ String bindDN = config.getBindDN();
+ if (bindDN != null && !bindDN.isEmpty()) {
+ cc.setName(bindDN);
cc.setCredentials(config.getBindPassword());
}
adminConnectionFactory = new PoolableLdapConnectionFactory(cc);