[bugfix] Avoid NPE in exist:time pragma

adamretter · adamretter · commit 90ee05b244a5 · 2023-10-09T16:21:20.000+02:00
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
@@ -99,10 +99,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
`@@ -99,10 +99,12 @@ public void after(final XQueryContext context, final Expression expression) thro`
`99`	`99`
`100`	`100`	`@Override`
`101`	`101`	`public void resetState(final boolean postOptimization) {`
`102`		`- if (timing != null && options.measurementMode == MeasurementMode.MULTIPLE) {`
`103`		`- logMultipleMeasurement();`
	`102`	`+ if (timing != null) {`
	`103`	`+ if (options.measurementMode == MeasurementMode.MULTIPLE) {`
	`104`	`+ logMultipleMeasurement();`
	`105`	`+ }`
	`106`	`+ this.timing.reset();`
`104`	`107`	`}`
`105`		`- this.timing.reset();`
`106`	`108`	`}`
`107`	`109`
`108`	`110`	`/**`