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

[baedke]

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

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


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

commit 022c7a6cf0f7399a0923527dd5f11e9bd4bc7b53
Author: Manfred Baedke <manfred.bae...@gmail.com>
AuthorDate: Wed Aug 6 18:32:46 2025 +0200

    OAK-11843: Improve diagnostics for NPE in SecureNodeBuilder
    
    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;
             }
         }