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

[bugfix] Avoid NPE in exist:time pragma
eXist-db · Oct 16, 2023 · 9abcd16 · 9abcd16
2 parents 6e80c9b + 5096226
commit 9abcd16
Showing 1 changed file with 5 additions and 3 deletions.
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();
     }
 
     /**