diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-09-18 23:45:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-18 23:45:54 +0200 |
commit | a8c10d0114c7157a34b82776d6c45aaf3e440147 (patch) | |
tree | 6fa9ec670ce1c99a5373c8013f9f2eb3a7cae986 /container-core | |
parent | 3a6bcde2ddcb322db6308e2817d1f3bdceded454 (diff) | |
parent | 060c1c8dc162ce9cf7e88b44f9fb986b511bf29b (diff) |
Merge pull request #14454 from vespa-engine/jonmv/async-document-v1
Jonmv/async document v1
Diffstat (limited to 'container-core')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java | 4 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index 3a99ee7d0c6..d729e2371c9 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -122,9 +122,9 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler "IO error while responding to " + " [" + request.getUri() + "] " + "(total time " + time + " ms) ", e); - try { if (output != null) output.flush(); } catch (Exception ignored) { } // TODO: Shouldn't this be channel.close()? + try { output.flush(); } catch (Exception ignored) { } } finally { - if (channel != null && !(httpResponse instanceof AsyncHttpResponse)) { + if (channel != null && ! (httpResponse instanceof AsyncHttpResponse)) { channel.close(logOnCompletion); } } diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java index 34ba7676680..c198e0e8b32 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java @@ -15,6 +15,8 @@ import com.yahoo.jdisc.handler.OverloadException; import com.yahoo.jdisc.handler.ReadableContentChannel; import com.yahoo.jdisc.handler.ResponseDispatch; import com.yahoo.jdisc.handler.ResponseHandler; + +import java.util.Objects; import java.util.logging.Level; import java.net.URI; @@ -73,14 +75,13 @@ public abstract class ThreadedRequestHandler extends AbstractRequestHandler { */ @Inject protected ThreadedRequestHandler(Executor executor, Metric metric, boolean allowAsyncResponse) { - executor.getClass(); // throws NullPointerException - this.executor = executor; + this.executor = Objects.requireNonNull(executor); this.metric = (metric == null) ? new NullRequestMetric() : metric; this.allowAsyncResponse = allowAsyncResponse; } Metric.Context contextFor(Request request, Map<String, String> extraDimensions) { - BindingMatch match = request.getBindingMatch(); + BindingMatch<?> match = request.getBindingMatch(); if (match == null) return null; UriPattern matched = match.matched(); if (matched == null) return null; |