svn commit: r1743349 - in /jackrabbit/oak/trunk/oak-auth-external/src: main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/ test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/

[angela]

Author: angela
Date: Wed May 11 12:42:54 2016
New Revision: 1743349

URL: http://svn.apache.org/viewvc?rev=1743349&view=rev
Log:
OAK-4360 : SyncMBeanImpl.syncUsers swallows errors

Modified:
    
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
    
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java

Modified: 
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.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/jmx/Delegatee.java?rev=1743349&r1=1743348&r2=1743349&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
 Wed May 11 12:42:54 2016
@@ -130,6 +130,7 @@ final class Delegatee {
                 append(list, syncUser(userId));
             } catch (SyncException e) {
                 log.warn(ERROR_SYNC_USER, userId, e);
+                append(list, new DefaultSyncedIdentity(userId, null, false, 
-1), e);
             }
         }
         return list.toArray(new String[list.size()]);

Modified: 
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.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/jmx/SyncMBeanImplTest.java?rev=1743349&r1=1743348&r2=1743349&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
 Wed May 11 12:42:54 2016
@@ -390,7 +390,6 @@ public class SyncMBeanImplTest {
     /**
      * @see <a 
href="https://issues.apache.org/jira/browse/OAK-4360";>OAK-4360</a>
      */
-    @Ignore("OAK-4360")
     @Test
     public void testSyncUserException() throws Exception {
         User u = userManager.createUser(TestIdentityProvider.ID_EXCEPTION, 
null);