diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-09-25 09:34:43 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-09-25 09:34:43 +0200 |
| commit | 0d12e6650c20799240eb9324ef426745d70ee58f (patch) | |
| tree | 3418ce6960d469c80c14fa0c4c607d53a6d57413 /container-core | |
| parent | 113045894aa7a1fe7b5e0f6b6074fe08f5ec25e1 (diff) | |
Non-functional changes
Diffstat (limited to 'container-core')
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java | 4 | ||||
| -rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java index 22933556d9f..8243ad07760 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/RequestHandlerTestDriver.java @@ -121,7 +121,7 @@ public class RequestHandlerTestDriver implements AutoCloseable { } /** - * Read the next piece of data from this channel even it blocking is needed. + * Read the next piece of data from this channel, blocking if needed. * If all data is already read, this returns null. */ public String read() { @@ -147,7 +147,7 @@ public class RequestHandlerTestDriver implements AutoCloseable { return responseString.toString(); } - /** Consumes all <i>currently</i> available data, or return "" if no data is available right now. Never blocks. */ + /** Consumes all <i>currently</i> available data, or returns "" if no data is available right now. Never blocks. */ public String readIfAvailable() { StringBuilder b = new StringBuilder(); while (content.available()>0) { 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 d729e2371c9..c46488694de 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 @@ -119,9 +119,7 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler metric.add(RENDERING_ERRORS, 1, null); long time = System.currentTimeMillis() - startTime; log.log(time < 900 ? Level.INFO : Level.WARNING, - "IO error while responding to " + " [" - + request.getUri() + "] " + "(total time " - + time + " ms) ", e); + "IO error while responding to [" + request.getUri() + "] (total time " + time + " ms) ", e); try { output.flush(); } catch (Exception ignored) { } } finally { if (channel != null && ! (httpResponse instanceof AsyncHttpResponse)) { |