Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Greg Wilkins 2016-08-05 17:02:56 +10:00
commit 9beef8e7a1
1 changed files with 2 additions and 2 deletions

View File

@ -268,7 +268,7 @@ public class ByteArrayEndPointTest
@Test @Test
public void testIdle() throws Exception public void testIdle() throws Exception
{ {
long idleTimeout = 500; long idleTimeout = 1500;
ByteArrayEndPoint endp = new ByteArrayEndPoint(_scheduler, idleTimeout); ByteArrayEndPoint endp = new ByteArrayEndPoint(_scheduler, idleTimeout);
endp.addInput("test"); endp.addInput("test");
endp.setGrowOutput(false); endp.setGrowOutput(false);
@ -284,7 +284,7 @@ public class ByteArrayEndPointTest
FutureCallback fcb = new FutureCallback(); FutureCallback fcb = new FutureCallback();
endp.fillInterested(fcb); endp.fillInterested(fcb);
fcb.get(100,TimeUnit.MILLISECONDS); fcb.get(idleTimeout,TimeUnit.MILLISECONDS);
assertTrue(fcb.isDone()); assertTrue(fcb.isDone());
assertEquals(null, fcb.get()); assertEquals(null, fcb.get());
assertEquals(4, endp.fill(buffer)); assertEquals(4, endp.fill(buffer));