Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
This commit is contained in:
commit
7314a9b86a
|
@ -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
|
||||
{
|
||||
|
|
|
@ -209,8 +209,6 @@ public class HttpChannelState
|
|||
return Action.DISPATCH;
|
||||
|
||||
case COMPLETING:
|
||||
return Action.COMPLETE;
|
||||
|
||||
case COMPLETED:
|
||||
return Action.TERMINATED;
|
||||
|
||||
|
|
Loading…
Reference in New Issue