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

Merged branch 'jetty-9.4.x' into 'master'.

This commit is contained in:
Simone Bordet 2016-05-19 11:51:15 +02:00
parent feb30c3a2b 46bc204e1c
commit 59ba37ad95
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
View File

@ -538,12 +538,6 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
LOG.warn(current);
else
LOG.debug(current);
}
else
{
LOG.ignore(current);
}
try
{
// Arbitrary sleep to avoid spin looping.
@ -557,6 +551,12 @@ public abstract class AbstractConnector extends ContainerLifeCycle implements Co
return false;
}
}
else
{
LOG.ignore(current);
return false;
}
}
private class Acceptor implements Runnable
{

21
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/PostServletTest.java
View File

@ -19,7 +19,9 @@
package org.eclipse.jetty.servlet;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import javax.servlet.http.HttpServlet;
@ -39,18 +41,23 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.Matchers.*;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
public class PostServletTest
{
private static final Logger LOG = Log.getLogger(PostServletTest.class);
private static final AtomicBoolean posted = new AtomicBoolean(false);
private static final AtomicReference<Throwable> ex0=new AtomicReference<>();
private static final AtomicReference<Throwable> ex1=new AtomicReference<>();
private static CountDownLatch complete;
public static class BasicReadPostServlet extends HttpServlet
{
protected void doPost(HttpServletRequest request, HttpServletResponse response)
{
posted.set(true);
byte[] buffer = new byte[1024];
try
{
@ -76,6 +83,10 @@ public class PostServletTest
LOG.warn(e1.toString());
}
}
finally
{
complete.countDown();
}
}
}
@ -85,8 +96,10 @@ public class PostServletTest
@Before
public void startServer() throws Exception
{
complete=new CountDownLatch(1);
ex0.set(null);
ex1.set(null);
posted.set(false);
server = new Server();
connector = new LocalConnector(server);
server.addConnector(connector);
@ -154,6 +167,7 @@ public class PostServletTest
String resp = connector.getResponses(req.toString());
assertThat(resp,is("")); // Aborted before response committed
}
assertTrue(complete.await(5,TimeUnit.SECONDS));
assertThat(ex0.get(),not(nullValue()));
assertThat(ex1.get(),not(nullValue()));
}
@ -171,6 +185,8 @@ public class PostServletTest
{
LocalConnector.LocalEndPoint endp=connector.executeRequest(req.toString());
Thread.sleep(1000);
assertFalse(posted.get());
req.setLength(0);
// intentionally bad (not a valid chunked char here)
for (int i=1024;i-->0;)
@ -211,7 +227,9 @@ public class PostServletTest
LocalConnector.LocalEndPoint endp=connector.executeRequest(req.toString());
req.setLength(0);
Thread.sleep(1000);
while(!posted.get())
Thread.sleep(100);
Thread.sleep(100);
req.append("x\r\n");
req.append("World\n");
req.append("\r\n");
@ -224,6 +242,7 @@ public class PostServletTest
assertThat("resp", resp, containsString("HTTP/1.1 200 "));
assertThat("resp", resp, not(containsString("\r\n0\r\n"))); // aborted
}
assertTrue(complete.await(5,TimeUnit.SECONDS));
assertThat(ex0.get(),not(nullValue()));
assertThat(ex1.get(),not(nullValue()));
}