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 re...@apache.org on 2016/12/20 16:58:56 UTC
svn commit: r1775320 - in /jackrabbit/oak/trunk/oak-auth-ldap: pom.xml
src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
Author: reschke
Date: Tue Dec 20 16:58:55 2016
New Revision: 1775320
URL: http://svn.apache.org/viewvc?rev=1775320&view=rev
Log:
OAK-5336: Update milestone dependency to org.apache.directory.api.api-all
Undoing previous changes, trying a more moderate version bump
Modified:
jackrabbit/oak/trunk/oak-auth-ldap/pom.xml
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/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/pom.xml?rev=1775320&r1=1775319&r2=1775320&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-ldap/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-auth-ldap/pom.xml Tue Dec 20 16:58:55 2016
@@ -137,7 +137,7 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
- <version>1.0.0-RC2</version>
+ <version>1.0.0-M33</version>
<scope>provided</scope>
</dependency>
<dependency>
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=1775320&r1=1775319&r2=1775320&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 Tue Dec 20 16:58:55 2016
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authentication.ldap.impl;
-import java.io.IOException;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -440,11 +439,7 @@ public class LdapIdentityProvider implem
throw new ExternalIdentityException("Error during ldap membership search.", e);
} finally {
if (searchCursor != null) {
- try {
- searchCursor.close();
- } catch (IOException e) {
- log.warn("Failed to close search cursor.", e);
- }
+ searchCursor.close();
}
disconnect(connection);
}
@@ -611,11 +606,7 @@ public class LdapIdentityProvider implem
}
} finally {
if (searchCursor != null) {
- try {
- searchCursor.close();
- } catch (IOException e) {
- log.warn("Failed to close search cursor.", e);
- }
+ searchCursor.close();
}
}
if (log.isDebugEnabled()) {
@@ -764,11 +755,7 @@ public class LdapIdentityProvider implem
return !page.isEmpty();
} finally {
if (searchCursor != null) {
- try {
- searchCursor.close();
- } catch (IOException e) {
- log.warn("Failed to close search cursor.", e);
- }
+ searchCursor.close();
}
disconnect(connection);
}