svn commit: r1883835 - /jackrabbit/oak/trunk/oak-auth-ldap/src/main/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProvider.java

[angela]

Author: angela
Date: Thu Nov 26 10:12:19 2020
New Revision: 1883835

URL: http://svn.apache.org/viewvc?rev=1883835&view=rev
Log:
OAK-9284 : LdapIdentityProvider.listGroups logs misleading warning

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=1883835&r1=1883834&r2=1883835&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
 Thu Nov 26 10:12:19 2020
@@ -243,9 +243,7 @@ public class LdapIdentityProvider implem
                 log.warn("referenced identity is neither user or group: {}", 
ref.getString());
                 return null;
             }
-        } catch (LdapException e) {
-            throw lookupFailedException(e, null);
-        } catch (CursorException e) {
+        } catch (LdapException | CursorException e) {
             throw lookupFailedException(e, null);
         } finally {
             disconnect(connection);
@@ -335,7 +333,7 @@ public class LdapIdentityProvider implem
                         try {
                             return createGroup(iter.next(), null);
                         } catch (LdapInvalidAttributeValueException e) {
-                            log.warn("Error while creating external user 
object", e);
+                            log.warn("Error while creating external group 
object", e);
                         }
                     }
                     return null;