Skip to content

Commit 4a94b68

Browse files
authored
Merge pull request #5081 from evolvedbinary/6.x.x/hotfix/time-pragma-npe
[6.x.x] Fix an NPE in exist:time pragma
2 parents 5818c56 + bd67ba8 commit 4a94b68

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

exist-core/src/main/java/org/exist/xquery/pragmas/TimePragma.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,12 @@ public void after(final XQueryContext context, final Expression expression) thro
9999

100100
@Override
101101
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();
104107
}
105-
this.timing.reset();
106108
}
107109

108110
/**

extensions/indexes/range/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@
9191
<version>${lucene.version}</version>
9292
</dependency>
9393

94+
<dependency>
95+
<groupId>com.google.code.findbugs</groupId>
96+
<artifactId>jsr305</artifactId>
97+
</dependency>
98+
9499
<dependency>
95100
<groupId>xml-apis</groupId>
96101
<artifactId>xml-apis</artifactId>

0 commit comments

Comments
 (0)