diff options
author | Greg Wilkins | 2015-02-04 00:44:43 +0000 |
---|---|---|
committer | Greg Wilkins | 2015-02-04 00:44:43 +0000 |
commit | f5588c7ada8850ee77e64a3795f144c8d150dad5 (patch) | |
tree | a46891f04d4f0c3045764f7ba1fc65d48e58d294 /jetty-servlet | |
parent | 65b88722271b916781b3f9f51a8ea1cd11570e44 (diff) | |
parent | acbffecb60942dd453e3455249c63644ffaff47e (diff) | |
download | org.eclipse.jetty.project-f5588c7ada8850ee77e64a3795f144c8d150dad5.tar.gz org.eclipse.jetty.project-f5588c7ada8850ee77e64a3795f144c8d150dad5.tar.xz org.eclipse.jetty.project-f5588c7ada8850ee77e64a3795f144c8d150dad5.zip |
Merge remote-tracking branch 'origin/jetty-9.2.x'
Diffstat (limited to 'jetty-servlet')
-rw-r--r-- | jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java index 7031e7f3f4..2af24f184c 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java @@ -417,7 +417,6 @@ public class AsyncIOServletTest @Test public void testIsNotReadyAtEOF() throws Exception { - final CountDownLatch latch = new CountDownLatch(1); String text = "Now is the winter of our discontent. How Now Brown Cow. The quick brown fox jumped over the lazy dog.\n"; final byte[] data = text.getBytes(StandardCharsets.ISO_8859_1); @@ -448,7 +447,7 @@ public class AsyncIOServletTest @Override public void onDataAvailable() throws IOException { - while(in.isReady()) + while(in.isReady() && !in.isFinished()) { int b = in.read(); if (b==-1) @@ -494,8 +493,5 @@ public class AsyncIOServletTest line=in.readLine(); assertThat(line, containsString("i="+data.length+" eof=false finished=true")); } - - if (!latch.await(5, TimeUnit.SECONDS)) - Assert.fail(); } } |