diff options
3 files changed, 2 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java index ffd342f36cd..44daec42b88 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletOutputStreamWriter.java @@ -198,7 +198,7 @@ class ServletOutputStreamWriter { final int bytesToSend = buffer.remaining(); try { if (buffer.hasArray()) { - outputStream.write(buffer.array(), buffer.arrayOffset(), buffer.remaining()); + outputStream.write(buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining()); } else { final byte[] array = new byte[buffer.remaining()]; buffer.get(array); diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/Utils.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/Utils.java index 5b341e0a3e6..d4b0771f482 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/Utils.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/Utils.java @@ -81,5 +81,4 @@ class Utils { client.start(); return client; } - } diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java index 061347aaa14..29fd419daa2 100644 --- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java +++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java @@ -745,7 +745,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler { break; if ( ! documentsDone) { - if (first) { // First chunk, remove leading comma from first document, then flush "json" to "buffer". + if (first) { // First chunk, remove leading comma from first document, and flush "json" to "buffer". json.flush(); buffer.write(ByteBuffer.wrap(doc.toByteArray(), 1, doc.size() - 1), null); first = false; |