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

Issue #434 RequestTest stack traces 

Added reset to ShutdownMonitor
This commit is contained in:
Greg Wilkins 2016-03-17 10:33:58 +11:00
parent 18aeca6567
commit df9de50f96
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-server/src/main/java/org/eclipse/jetty/server/ShutdownMonitor.java
View File

@ -64,6 +64,11 @@ public class ShutdownMonitor
return Holder.instance; return Holder.instance;
} }
protected static void reset()
{
Holder.instance = new ShutdownMonitor();
}
public static void register(LifeCycle... lifeCycles) public static void register(LifeCycle... lifeCycles)
{ {
getInstance().addLifeCycles(lifeCycles); getInstance().addLifeCycles(lifeCycles);

7
jetty-server/src/test/java/org/eclipse/jetty/server/ShutdownMonitorTest.java
View File

@ -26,6 +26,7 @@ import java.net.InetAddress;
import java.net.Socket; import java.net.Socket;
import org.eclipse.jetty.util.thread.ShutdownThread; import org.eclipse.jetty.util.thread.ShutdownThread;
import org.junit.AfterClass;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
@ -33,6 +34,12 @@ import static org.junit.Assert.assertTrue;
public class ShutdownMonitorTest public class ShutdownMonitorTest
{ {
@AfterClass
public static void afterClass()
{
ShutdownMonitor.reset();
}
@Test @Test
public void testShutdownMonitor() throws Exception public void testShutdownMonitor() throws Exception
{ {