Skip to content

Commit 880caf3

Browse files
authored
Merge pull request #139 from evolvedbinary/6.x.x/hotfix/npe-xupdate
[6.x.x] Avoid an NPE when there are no XUpdate Conditionals
2 parents e3b2a9e + 72ce76a commit 880caf3

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

exist-core/src/main/java/org/exist/xupdate/XUpdateProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ private Conditional popConditional() {
949949

950950
private @Nullable Conditional peekConditional() {
951951
if (conditionals == null) {
952-
throw null;
952+
return null;
953953
}
954954
return conditionals.peek();
955955
}

0 commit comments

Comments
 (0)