Merge pull request #138 from evolvedbinary/7.x.x/hotfix/npe-xupdate

adamretter · web-flow · commit afc5717856b5 · 2025-11-06T01:07:23.000+03:00
[7.x.x] Avoid an NPE when there are no XUpdate Conditionals
diff --git a/exist-core/src/main/java/org/exist/xupdate/XUpdateProcessor.java b/exist-core/src/main/java/org/exist/xupdate/XUpdateProcessor.java
@@ -950,7 +950,7 @@ private Conditional popConditional() {
 
     private @Nullable Conditional peekConditional() {
         if (conditionals == null) {
-            throw null;
+            return null;
         }
         return conditionals.peek();
     }

Original file line number	Diff line number	Diff line change
`@@ -950,7 +950,7 @@ private Conditional popConditional() {`
`950`	`950`
`951`	`951`	`private @Nullable Conditional peekConditional() {`
`952`	`952`	`if (conditionals == null) {`
`953`		`- throw null;`
	`953`	`+ return null;`
`954`	`954`	`}`
`955`	`955`	`return conditionals.peek();`
`956`	`956`	`}`