You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2026/01/15 10:54:09 UTC

(jackrabbit-filevault) 01/01: JCRVLT-831: For collection of namespace prefixes, avoid iterating over sibling nodes not contained in the filter(s)

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch JCRVLT-831
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git

commit e67d0425c6dea23725c7014f5644515d156aaf38
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Thu Jan 15 11:53:48 2026 +0100

    JCRVLT-831: For collection of namespace prefixes, avoid iterating over sibling nodes not contained in the filter(s)
---
 .../org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java
index 9e4b3a06..f37653cc 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/fs/impl/AggregateImpl.java
@@ -645,12 +645,18 @@ public class AggregateImpl implements Aggregate {
                 addNamespace(prefixes, p);
             }
         }
-        for (NodeIterator iter = node.getNodes(); iter.hasNext(); ) {
+        boolean hasOrderableChildNodes = node.getPrimaryNodeType().hasOrderableChildNodes();
+        // use the node iterator optimized for the workspace filter if and only if the node is not orderable,
+        // in which case we still need to visit all sibling nodes, as their prefixes wil be needed in the
+        // serialization (as empty nodes)
+        NodeIterator iter =
+                hasOrderableChildNodes ? node.getNodes() : getNodeIteratorFor(node, mgr.getWorkspaceFilter());
+        while (iter.hasNext()) {
             Node c = iter.nextNode();
             String relPath = parentPath + "/" + c.getName();
             if (includes(relPath)) {
                 loadNamespaces(prefixes, relPath, c);
-            } else if (node.getPrimaryNodeType().hasOrderableChildNodes()) {
+            } else if (hasOrderableChildNodes) {
                 addNamespace(prefixes, c.getName());
             }
         }