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 ba...@apache.org on 2025/08/06 16:43:58 UTC

(jackrabbit-oak) branch trunk updated: OAK-11843: Improve diagnostics for NPE in SecureNodeBuilder (#2434)

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

baedke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/trunk by this push:
     new de7d2f063f OAK-11843: Improve diagnostics for NPE in SecureNodeBuilder (#2434)
de7d2f063f is described below

commit de7d2f063f7ecb509bd300c1ecfedcd52dc5a7a9
Author: mbaedke <ma...@gmail.com>
AuthorDate: Wed Aug 6 18:43:52 2025 +0200

    OAK-11843: Improve diagnostics for NPE in SecureNodeBuilder (#2434)
    
    Added null checks.
---
 .../java/org/apache/jackrabbit/oak/core/SecureNodeBuilder.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 58b735484f..3f04699e15 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
@@ -353,14 +353,15 @@ class SecureNodeBuilder implements NodeBuilder {
         if (treePermission == null
                 || rootPermission != rootBuilder.treePermission) {
             NodeState base = builder.getBaseState();
+            String msg = "see OAK-11790 and OAK-11843";
             if (parent == null) {
                 Tree baseTree = TreeFactory.createReadOnlyTree(base);
-                treePermission = permissionProvider.get().getTreePermission(baseTree, TreePermission.EMPTY);
+                PermissionProvider provider = requireNonNull(permissionProvider.get(), msg);
+                treePermission = requireNonNull(provider.getTreePermission(baseTree, TreePermission.EMPTY), msg);
                 rootPermission = treePermission;
             } else {
-                treePermission =
-                        Objects.requireNonNull(parent.getTreePermission().getChildPermission(name, base),
-                                "see OAK-11790 and OAK-11843");
+                TreePermission parentTreePermission = Objects.requireNonNull(parent.getTreePermission(), msg);
+                treePermission = Objects.requireNonNull(parentTreePermission.getChildPermission(name, base), msg);
                 rootPermission = parent.rootPermission;
             }
         }