Merge pull request #5081 from evolvedbinary/6.x.x/hotfix/time-pragma-npe

[6.x.x] Fix an NPE in exist:time pragma
eXist-db · Oct 16, 2023 · 4a94b68 · 4a94b68
2 parents 5818c56 + bd67ba8
commit 4a94b68
Show file tree

Hide file tree

Showing 2 changed files with 10 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
@@ -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();
     }
 
     /**

diff --git a/extensions/indexes/range/pom.xml b/extensions/indexes/range/pom.xml
@@ -91,6 +91,11 @@
             <version>${lucene.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>xml-apis</groupId>
             <artifactId>xml-apis</artifactId>