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 to...@apache.org on 2017/08/17 14:58:49 UTC

svn commit: r1805297 - /jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java

Author: tomekr
Date: Thu Aug 17 14:58:49 2017
New Revision: 1805297

URL: http://svn.apache.org/viewvc?rev=1805297&view=rev
Log:
OAK-6559: Don't allow to place mounts under mounts

Modified:
    jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java

Modified: jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java?rev=1805297&r1=1805296&r2=1805297&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java (original)
+++ jackrabbit/oak/trunk/oak-store-composite/src/main/java/org/apache/jackrabbit/oak/composite/CompositionContext.java Thu Aug 17 14:58:49 2017
@@ -90,12 +90,15 @@ class CompositionContext {
     }
 
     boolean shouldBeComposite(final String path) {
+        boolean supportMounts = false;
         if (nonDefaultStores.stream()
                 .map(MountedNodeStore::getMount)
                 .anyMatch(m -> m.isSupportFragment(path))) {
-            return true;
+            supportMounts = true;
+        } else if (!mip.getMountsPlacedUnder(path).isEmpty()) {
+            supportMounts = true;
         }
-        return !mip.getMountsPlacedUnder(path).isEmpty();
+        return supportMounts && mip.getMountByPath(path).isDefault();
     }
 
     private List<MountedNodeStore> getContributingStores(String path, Function<MountedNodeStore, Iterable<String>> childrenProvider) {