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 tr...@apache.org on 2016/04/25 21:17:46 UTC
svn commit: r1740879 - in /jackrabbit/oak/trunk/oak-auth-external/src:
main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/
test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/
Author: tripod
Date: Mon Apr 25 19:17:46 2016
New Revision: 1740879
URL: http://svn.apache.org/viewvc?rev=1740879&view=rev
Log:
OAK-4048 [regression] SyncHandler.listIdentities() returns all users, not only external ones
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java
Modified: jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java?rev=1740879&r1=1740878&r2=1740879&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java Mon Apr 25 19:17:46 2016
@@ -144,7 +144,7 @@ public class DefaultSyncHandler implemen
while (iter.hasNext()) {
try {
SyncedIdentity id = DefaultSyncContext.createSyncedIdentity(iter.next());
- if (id != null) {
+ if (id != null && id.getExternalIdRef() != null) {
return id;
}
} catch (RepositoryException e) {
Modified: jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java?rev=1740879&r1=1740878&r2=1740879&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java (original)
+++ jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java Mon Apr 25 19:17:46 2016
@@ -48,6 +48,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* DefaultSyncHandlerTest
@@ -222,9 +223,9 @@ public class DefaultSyncHandlerTest exte
@Test
public void testListIdentitiesBeforeSync() throws Exception {
Iterator<SyncedIdentity> identities = syncHandler.listIdentities(userManager);
- while (identities.hasNext()) {
+ if (identities.hasNext()) {
SyncedIdentity si = identities.next();
- assertNull(si.getExternalIdRef());
+ fail("Sync handler returned unexpected identity: " + si);
}
}
@@ -245,7 +246,7 @@ public class DefaultSyncHandlerTest exte
expected.remove(si.getId());
assertNotNull(si.getExternalIdRef());
} else {
- assertNull(si.getExternalIdRef());
+ fail("Sync handler returned unexpected identity: " + si);
}
}
assertTrue(expected.isEmpty());