svn commit: r1689932 - in /jackrabbit/oak/trunk: oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java

[tripod]

Author: tripod
Date: Wed Jul  8 18:44:41 2015
New Revision: 1689932

URL: http://svn.apache.org/r1689932
Log:
OAK-3032 LDAP test failures

- fixing regression introduced by OAK-2998 by ensuring that LoginModuleImpl 
does not commit if login was not successful

Modified:
    
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java

Modified: 
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java?rev=1689932&r1=1689931&r2=1689932&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/LdapLoginTestBase.java
 Wed Jul  8 18:44:41 2015
@@ -306,7 +306,6 @@ public abstract class LdapLoginTestBase
         }
     }
 
-    @Ignore("OAK-3032")
     @Test
     public void testPrincipalsFromAuthInfo() throws Exception {
         ContentSession cs = null;

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java?rev=1689932&r1=1689931&r2=1689932&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
 Wed Jul  8 18:44:41 2015
@@ -139,6 +139,10 @@ public final class LoginModuleImpl exten
             log.debug("Adding login name to shared state.");
             //noinspection unchecked
             sharedState.put(SHARED_KEY_LOGIN_NAME, userId);
+        } else {
+            // ensure that we don't commit (OAK-2998, OAK-3032)
+            credentials = null;
+            userId = null;
         }
         return success;
     }