You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-dev@jackrabbit.apache.org by Amit Jain <am...@ieee.org> on 2016/12/20 06:22:34 UTC
Re: svn commit: r1775152 - in /jackrabbit/oak/trunk/oak-auth-ldap:
pom.xml src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java
There are lot of test failures because of this commit (reproducible on
local as well)
https://builds.apache.org/job/Apache%20Jackrabbit%20Oak%20matrix/Ubuntu%20Slaves=ubuntu,jdk=JDK%201.7%20(latest),nsfixtures=SEGMENT_MK,profile=unittesting/1337/
On Mon, Dec 19, 2016 at 11:57 PM, <ba...@apache.org> wrote:
> Author: baedke
> Date: Mon Dec 19 18:27:45 2016
> New Revision: 1775152
>
> URL: http://svn.apache.org/viewvc?rev=1775152&view=rev
> Log:
> OAK-5336: Update milestone dependency to org.apache.directory.api.api-all
>
> Updated to apache.directory.api.api-all-1.0.0-RC2.
>
> 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=1775152&r1=1775151&r2=1775152&view=diff
> ============================================================
> ==================
> --- jackrabbit/oak/trunk/oak-auth-ldap/pom.xml (original)
> +++ jackrabbit/oak/trunk/oak-auth-ldap/pom.xml Mon Dec 19 18:27:45 2016
> @@ -137,7 +137,7 @@
> <dependency>
> <groupId>org.apache.directory.api</groupId>
> <artifactId>api-all</artifactId>
> - <version>1.0.0-M30</version>
> + <version>1.0.0-RC2</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=
> 1775152&r1=1775151&r2=1775152&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
> Mon Dec 19 18:27:45 2016
> @@ -16,6 +16,7 @@
> */
> 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;
> @@ -439,7 +440,11 @@ public class LdapIdentityProvider implem
> throw new ExternalIdentityException("Error during ldap
> membership search.", e);
> } finally {
> if (searchCursor != null) {
> - searchCursor.close();
> + try {
> + searchCursor.close();
> + } catch (IOException e) {
> + log.warn("Failed to close search cursor.", e);
> + }
> }
> disconnect(connection);
> }
> @@ -606,7 +611,11 @@ public class LdapIdentityProvider implem
> }
> } finally {
> if (searchCursor != null) {
> - searchCursor.close();
> + try {
> + searchCursor.close();
> + } catch (IOException e) {
> + log.warn("Failed to close search cursor.", e);
> + }
> }
> }
> if (log.isDebugEnabled()) {
> @@ -755,7 +764,11 @@ public class LdapIdentityProvider implem
> return !page.isEmpty();
> } finally {
> if (searchCursor != null) {
> - searchCursor.close();
> + try {
> + searchCursor.close();
> + } catch (IOException e) {
> + log.warn("Failed to close search cursor.", e);
> + }
> }
> disconnect(connection);
> }
>
>
>