Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Jan Bartel 2016-06-08 16:25:23 +10:00
commit 7314a9b86a
2 changed files with 2 additions and 2 deletions

View File

@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.eclipse.jetty.util.component.Dumpable;
import org.eclipse.jetty.util.log.StacklessLogging;
import org.junit.Ignore;
import org.junit.Test;
@ -36,6 +37,7 @@ public class ThreadMonitorTest
{
public final static int DURATION=4000;
@Ignore
@Test
public void monitorTest() throws Exception
{

View File

@ -209,8 +209,6 @@ public class HttpChannelState
return Action.DISPATCH;
case COMPLETING:
return Action.COMPLETE;
case COMPLETED:
return Action.TERMINATED;