Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.2.x'

This commit is contained in:
Greg Wilkins 2015-02-04 11:44:43 +11:00
parent 65b8872227 acbffecb60
commit f5588c7ada
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncIOServletTest.java
View File

@ -417,7 +417,6 @@ public class AsyncIOServletTest
@Test @Test
public void testIsNotReadyAtEOF() throws Exception 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"; 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); final byte[] data = text.getBytes(StandardCharsets.ISO_8859_1);
@ -448,7 +447,7 @@ public class AsyncIOServletTest
@Override @Override
public void onDataAvailable() throws IOException public void onDataAvailable() throws IOException
{ {
while(in.isReady()) while(in.isReady() && !in.isFinished())
{ {
int b = in.read(); int b = in.read();
if (b==-1) if (b==-1)
@ -494,8 +493,5 @@ public class AsyncIOServletTest
line=in.readLine(); line=in.readLine();
assertThat(line, containsString("i="+data.length+" eof=false finished=true")); assertThat(line, containsString("i="+data.length+" eof=false finished=true"));
} }
if (!latch.await(5, TimeUnit.SECONDS))
Assert.fail();
} }
} }