Author: angela
Date: Fri Apr 8 14:38:20 2016
New Revision: 1738252
URL: http://svn.apache.org/viewvc?rev=1738252&view=rev
Log:
OAK-4119 : potential improvements to membership management - Take 1
- UserImporter: adding/removing members must not call 'handleFailure' if the
set of failed ids is empty
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java?rev=1738252&r1=1738251&r2=1738252&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
Fri Apr 8 14:38:20 2016
@@ -630,12 +630,16 @@ class UserImporter implements ProtectedP
// 2. adjust members of the group
if (!toRemove.isEmpty()) {
Set<String> failed =
gr.removeMembers(toRemove.keySet().toArray(new String[toRemove.size()]));
- handleFailure("Failed removing members " +
Iterables.toString(failed) + " to " + gr);
+ if (!failed.isEmpty()) {
+ handleFailure("Failed removing members " +
Iterables.toString(failed) + " to " + gr);
+ }
}
if (!toAdd.isEmpty()) {
Set<String> failed = gr.addMembers(toAdd.keySet().toArray(new
String[toAdd.size()]));
- handleFailure("Failed add members " +
Iterables.toString(failed) + " to " + gr);
+ if (!failed.isEmpty()) {
+ handleFailure("Failed add members " +
Iterables.toString(failed) + " to " + gr);
+ }
}
// handling non-existing members in case of best-effort
