Merge pull request #5082 from evolvedbinary/hotfix/time-pragma-npe

dizzzz · web-flow · commit 9abcd16cab46 · 2023-10-16T19:30:56.000+02:00
[bugfix] Avoid NPE in exist:time pragma
diff --git a/exist-core/src/main/java/org/exist/xquery/pragmas/TimePragma.java b/exist-core/src/main/java/org/exist/xquery/pragmas/TimePragma.java
@@ -100,10 +100,12 @@ public void after(final XQueryContext context, final Expression expression) thro
 
     @Override
     public void resetState(final boolean postOptimization) {
-        if (timing != null && options.measurementMode == MeasurementMode.MULTIPLE) {
-            logMultipleMeasurement();
+        if (timing != null) {
+            if (options.measurementMode == MeasurementMode.MULTIPLE) {
+                logMultipleMeasurement();
+            }
+            this.timing.reset();
         }
-        this.timing.reset();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -100,10 +100,12 @@ public void after(final XQueryContext context, final Expression expression) thro`
`100`	`100`
`101`	`101`	`@Override`
`102`	`102`	`public void resetState(final boolean postOptimization) {`
`103`		`- if (timing != null && options.measurementMode == MeasurementMode.MULTIPLE) {`
`104`		`- logMultipleMeasurement();`
	`103`	`+ if (timing != null) {`
	`104`	`+ if (options.measurementMode == MeasurementMode.MULTIPLE) {`
	`105`	`+ logMultipleMeasurement();`
	`106`	`+ }`
	`107`	`+ this.timing.reset();`
`105`	`108`	`}`
`106`		`- this.timing.reset();`
`107`	`109`	`}`
`108`	`110`
`109`	`111`	`/**`