1 files changed, 7 insertions, 8 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
index e9aba0cb6c9..c16ac589332 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/HttpRequestDispatch.java
@@ -101,6 +101,13 @@ class HttpRequestDispatch {
         HttpRequestDispatch parent = this; //used to avoid binding uninitialized variables
 
         completeRequestCallback = (result, error) -> {
+            boolean alreadyCalled = completeRequestCalled.getAndSet(true);
+            if (alreadyCalled) {
+                AssertionError e = new AssertionError("completeRequest called more than once");
+                log.log(Level.WARNING, "Assertion failed.", e);
+                throw e;
+            }
+
             boolean reportedError = false;
 
             if (error != null) {
@@ -113,14 +120,6 @@ class HttpRequestDispatch {
                 parent.metricReporter.successfulResponse();
             }
 
-
-            boolean alreadyCalled = completeRequestCalled.getAndSet(true);
-            if (alreadyCalled) {
-                AssertionError e = new AssertionError("completeRequest called more than once");
-                log.log(Level.WARNING, "Assertion failed.", e);
-                throw e;
-            }
-
             try {
                 parent.async.complete();
                 log.finest(() -> "Request completed successfully: " + parent.servletRequest.getRequestURI());