[bugfix] Avoid 2nd potential XQuery trigger leak

alanpaxton · adamretter · commit 4ac2f6f68384 · 2024-10-08T21:44:14.000+02:00
We may leak trigger states to thread local which can potentially occur when the specified XQueryTrigger library module is not available in the database Closes #5459
diff --git a/exist-core/src/main/java/org/exist/collections/triggers/XQueryTrigger.java b/exist-core/src/main/java/org/exist/collections/triggers/XQueryTrigger.java
@@ -411,6 +411,7 @@ private void execute(final TriggerPhase phase, final TriggerEvent event, final D
 			compiledQuery = getScript(broker, transaction);
 			if (compiledQuery == null) {
 				// NOTE: can occur if there is no such XQueryTrigger library module available in the database
+				TriggerStatePerThread.clearIfFinished(phase);
 				return;
 			}
 		} catch (final TriggerException e) {

Original file line number	Diff line number	Diff line change
`@@ -411,6 +411,7 @@ private void execute(final TriggerPhase phase, final TriggerEvent event, final D`
`411`	`411`	`compiledQuery = getScript(broker, transaction);`
`412`	`412`	`if (compiledQuery == null) {`
`413`	`413`	`// NOTE: can occur if there is no such XQueryTrigger library module available in the database`
	`414`	`+ TriggerStatePerThread.clearIfFinished(phase);`
`414`	`415`	`return;`
`415`	`416`	`}`
`416`	`417`	`} catch (final TriggerException e) {`