diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java index 292ce1b84e2..2814ded8cd6 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java @@ -839,7 +839,7 @@ public class HttpOutput extends ServletOutputStream implements Runnable _buffer.position(pl); _slice.position(p); _completed=!_buffer.hasRemaining(); - _channel.write(_buffer, _complete && _completed, this); + _channel.write(_slice, _complete && _completed, this); return State.SCHEDULED; } diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java index c6cd0a37675..44ba8b51ebf 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncServletIOTest.java @@ -128,8 +128,6 @@ public class AsyncServletIOTest Assert.assertThat(_owp.get(),Matchers.greaterThan(1)); } - - @Test public void testRead() throws Exception { @@ -234,6 +232,7 @@ public class AsyncServletIOTest break; //System.err.println("line: "+line.length()+"\t"+(line.length()>40?(line.substring(0,40)+"..."):line)); list.add(line); + Thread.sleep(50); } }