From d3d9a2789d1549a6e93e8c8bc1bb5d2926ef819e Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 3 Dec 2024 18:24:36 -0500
Subject: [PATCH] Defend against null `AbstractFolder.primaryView`

---
 .../hudson/plugins/folder/AbstractFolder/sidepanel.jelly | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/sidepanel.jelly b/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/sidepanel.jelly
index 482ea4b5..914d78d7 100644
--- a/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/sidepanel.jelly
+++ b/src/main/resources/com/cloudbees/hudson/plugins/folder/AbstractFolder/sidepanel.jelly
@@ -23,8 +23,11 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
-    <j:if test="${view == null}"> <!-- true when rendering from ModelObjectWithContextMenu.ContextMenu.from -->
-        <j:set var="view" value="${it.primaryView}"/>
+    <j:set var="primaryView" value="${it.primaryView}"/>
+    <j:if test="${primaryView != null}">
+        <j:if test="${view == null}"> <!-- true when rendering from ModelObjectWithContextMenu.ContextMenu.from -->
+            <j:set var="view" value="${primaryView}"/>
+        </j:if>
+        <st:include it="${primaryView}" page="sidepanel.jelly"/>
     </j:if>
-    <st:include it="${it.primaryView}" page="sidepanel.jelly"/>
 </j:jelly>