This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11843 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 191b6ff98f43a6e78945ab3a495b3eb84a3f967f Author: Julian Reschke <julian.resc...@gmx.de> AuthorDate: Wed Aug 6 11:49:37 2025 +0100 OAK-11843: Improve diagnostics for NPE in SecureNodeBuilder --- .../main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java index 530064a7f9..58b735484f 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java @@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.core; import java.io.IOException; import java.io.InputStream; +import java.util.Objects; import java.util.function.Predicate; import org.apache.jackrabbit.oak.api.Blob; @@ -357,7 +358,9 @@ class SecureNodeBuilder implements NodeBuilder { treePermission = permissionProvider.get().getTreePermission(baseTree, TreePermission.EMPTY); rootPermission = treePermission; } else { - treePermission = parent.getTreePermission().getChildPermission(name, base); + treePermission = + Objects.requireNonNull(parent.getTreePermission().getChildPermission(name, base), + "see OAK-11790 and OAK-11843"); rootPermission = parent.rootPermission; } }