SLING-8826 - fix allowDuration() for duration provided in nanoseconds
diff --git a/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java b/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java
index 75947ad..7ff83ac 100644
--- a/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java
+++ b/src/main/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilter.java
@@ -95,7 +95,7 @@
private String[] extensions;
- static final int NANOSEC_TO_MSEC = 1000000;
+ static final int NANOSEC_TO_MSEC = 1_000_000;
@Override
public void init(final FilterConfig filterConfig) throws ServletException {
@@ -167,7 +167,7 @@
private boolean allowDuration(final RequestProgressTracker rpt) {
if (rpt instanceof SlingRequestProgressTracker) {
- long duration = ((SlingRequestProgressTracker) rpt).getDuration();
+ final long duration = ((SlingRequestProgressTracker) rpt).getDuration() / NANOSEC_TO_MSEC;
return configuration.minDurationMs() <= duration && duration <= configuration.maxDurationMs();
} else {
log.debug("Logged requests can only be filtered by duration if the SlingRequestProgressTracker is used.");
diff --git a/src/test/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilterTest.java b/src/test/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilterTest.java
index bd7b88a..9c6ae42 100644
--- a/src/test/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilterTest.java
+++ b/src/test/java/org/apache/sling/engine/impl/debug/RequestProgressTrackerLogFilterTest.java
@@ -90,11 +90,11 @@
Thread.sleep(delta * 2);
rpt.done();
final long durationNanos = rpt.getDuration();
- final long durationMsec = durationNanos; // TODO SLING-8826: should be duration / 1000;
+ final long durationMsec = durationNanos / 1_000_000;
final int minMsec = (int)(durationMsec - delta);
final int maxMsec = (int)(durationMsec + delta);
setupMinMaxDuration(filter, minMsec, maxMsec);
- assertTrue("Expecting duration " + durationNanos + " to allowed for min=" + minMsec + " max=" + maxMsec,
+ assertTrue("Expecting duration " + durationNanos + "/" + durationMsec + " to allowed for min=" + minMsec + " max=" + maxMsec,
(boolean)allowDuration.invoke(filter, rpt));
}
}
