diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-09-14 12:54:59 +0200 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-09-14 12:55:04 +0200 |
commit | 2c5028827208f37292774d233e2f3918a2728260 (patch) | |
tree | 167891ac17ef8d6d34468f1cdffac58619cb8f1d | |
parent | f3f0e30ca61aaae20193671e2976a2300922757f (diff) |
Non-functional
3 files changed, 10 insertions, 9 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; diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSession.java index 6022fbf6e39..fb6ed192cad 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSession.java @@ -13,26 +13,26 @@ public interface MessageBusSession { * * @return The route string. */ - public String getRoute(); + String getRoute(); /** * Sets the route to send all messages to when sending through this session. * * @param route The route string. */ - public void setRoute(String route); + void setRoute(String route); /** * Returns the trace level used when sending messages through this session. * * @return The trace level. */ - public int getTraceLevel(); + int getTraceLevel(); /** * Sets the trace level used when sending messages through this session. * * @param traceLevel The trace level to set. */ - public void setTraceLevel(int traceLevel); + void setTraceLevel(int traceLevel); } |