svn commit: r1802553 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java

[stillalex]

Author: stillalex
Date: Fri Jul 21 08:18:17 2017
New Revision: 1802553

URL: http://svn.apache.org/viewvc?rev=1802553&view=rev
Log:
OAK-6461 Merge all security related validators into a single hook


Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java?rev=1802553&r1=1802552&r2=1802553&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/MutableRoot.java
 Fri Jul 21 08:18:17 2017
@@ -272,6 +272,8 @@ class MutableRoot implements Root {
         hooks.add(hook);
 
         List<CommitHook> postValidationHooks = new ArrayList<CommitHook>();
+        List<ValidatorProvider> validators = new ArrayList<>();
+
         for (SecurityConfiguration sc : securityProvider.getConfigurations()) {
             for (CommitHook ch : sc.getCommitHooks(workspaceName)) {
                 if (ch instanceof PostValidationHook) {
@@ -281,10 +283,11 @@ class MutableRoot implements Root {
                 }
             }
 
-            List<? extends ValidatorProvider> validators = 
sc.getValidators(workspaceName, subject.getPrincipals(), moveTracker);
-            if (!validators.isEmpty()) {
-                hooks.add(new 
EditorHook(CompositeEditorProvider.compose(validators)));
-            }
+            validators.addAll(sc.getValidators(workspaceName, 
subject.getPrincipals(), moveTracker));
+        }
+
+        if (!validators.isEmpty()) {
+            hooks.add(new 
EditorHook(CompositeEditorProvider.compose(validators)));
         }
         hooks.addAll(postValidationHooks);