Merge branch 'jetty-9.1' into release-9.1

This commit is contained in:
Jesse McConnell 2013-10-31 16:10:32 -05:00
commit a365e9ae11
1 changed files with 3 additions and 3 deletions

View File

@ -135,7 +135,7 @@ public class AsyncContextTest
Assert.assertEquals("error servlet","ERROR: /error",br.readLine());
Assert.assertEquals("error servlet","PathInfo= /IOE",br.readLine());
Assert.assertEquals("error servlet","EXCEPTION: java.io.IOException: Test",br.readLine());
Assert.assertEquals("error servlet","EXCEPTION: org.eclipse.jetty.server.QuietServletException: java.io.IOException: Test",br.readLine());
}
@Test
@ -350,7 +350,7 @@ public class AsyncContextTest
Assert.assertEquals("error servlet","ERROR: /error",br.readLine());
Assert.assertEquals("error servlet","PathInfo= /500",br.readLine());
Assert.assertEquals("error servlet","EXCEPTION: java.io.IOException: TEST",br.readLine());
Assert.assertEquals("error servlet","EXCEPTION: java.lang.RuntimeException: TEST",br.readLine());
}
private class DispatchingRunnable implements Runnable
@ -424,7 +424,7 @@ public class AsyncContextTest
@Override
public void onTimeout(AsyncEvent event) throws IOException
{
throw new IOException("TEST");
throw new RuntimeException("TEST");
}
@Override