diff options
3 files changed, 4 insertions, 6 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)) { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java index ff891dbb298..c60cd9cc378 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusDocumentAccess.java @@ -92,7 +92,7 @@ public class MessageBusDocumentAccess extends DocumentAccess { @Override public MessageBusVisitorSession createVisitorSession(VisitorParameters params) throws ParseException, IllegalArgumentException { MessageBusVisitorSession session = MessageBusVisitorSession.createForMessageBus( - bus.getMessageBus(), scheduledExecutorService, params); + messageBus(), scheduledExecutorService, params); session.start(); return session; } |