Non-functional

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 ac1aa533201..ac302d6215b 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
@@ -123,9 +123,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;