modify post filter handling to completely ignore artifacts not neither

ancestor of a filter nor contained in it

Author: kwin

vault-core/src/main/java/org/apache/jackrabbit/vault/fs/io/Importer.java

@@ -529,10 +529,7 @@ public void run(Archive archive, Session session,  String parentPath)
      */
     private TxInfo postFilter(TxInfo root) {
         TxInfo modifierRoot = root;
-        if (filter.contains(modifierRoot.path)){
-            return modifierRoot;
-        }
-        if (filter.isAncestor(modifierRoot.path)) {
+        if (filter.isAncestor(modifierRoot.path) || filter.contains(modifierRoot.path)) {
             for (String k : modifierRoot.children().keySet()) {
                 TxInfo child = modifierRoot.children().get(k);
                 modifierRoot.children().put(k, postFilter(child));

vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/ACLAndMergeIT.java

@@ -482,6 +482,6 @@ public void testACLsOutsideFilter() throws IOException, PackageException, Reposi
         assertPermissionMissing("/testroot", false, new String[]{"jcr:all"}, "everyone", null);
 
         // this is not contained in the filter root but installed nevertheless (due to ancestor being a filter root)
-        assertPermission("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
+        assertPermissionMissing("/testroot/secured", false, new String[]{"jcr:all"}, "everyone", null);
     }
 }