Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 20:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x

Browse Source
This commit is contained in:
Joakim Erdfelt 2018-02-26 13:34:05 -06:00
commit a19995b755
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SelectChannelServerSslTest.java
View File

@ -101,8 +101,17 @@ public class SelectChannelServerSslTest extends HttpServerTestBase
}
catch (SocketException e)
{
// TODO This needs to be investigated #2244
Log.getLogger(SslConnection.class).warn("Close overtook 400 response");
}
catch (SSLException e)
{
// TODO This needs to be investigated #2244
if (e.getCause() instanceof SocketException)
Log.getLogger(SslConnection.class).warn("Close overtook 400 response");
else
throw e;
}
}
@Override

2
tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/AsyncIOServletTest.java
View File

@ -80,6 +80,7 @@ import org.eclipse.jetty.util.log.StacklessLogging;
import org.hamcrest.Matchers;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Ignore;
import org.junit.Test;
import static java.nio.ByteBuffer.wrap;
@ -424,6 +425,7 @@ public class AsyncIOServletTest extends AbstractTest
}
@Test
@Ignore // TODO fix this test! #2243
public void testAsyncWriteClosed() throws Exception
{
// TODO work out why this test fails for UNIX_SOCKET