JENKINS-40979 NPE where child can be null

jenkinsci · Apr 24, 2017 · 8b7e561 · 8b7e561
1 parent a9fd82e
commit 8b7e561
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/core/src/main/java/org/kohsuke/stapler/export/FilteringTreePruner.java b/core/src/main/java/org/kohsuke/stapler/export/FilteringTreePruner.java
@@ -25,7 +25,7 @@ public TreePruner accept(Object node, Property prop) {
 
         // for merge properties, the current restrictions on the property names should
         // still apply to the child TreePruner
-        if (prop.merge)
+        if (prop.merge && child != null)
             child = new FilteringTreePruner(predicate,child);
 
         return child;