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

Merge remote-tracking branch 'origin/jetty-7' into jetty-8

This commit is contained in:
Greg Wilkins 2013-03-05 10:40:45 +11:00
parent 095e66db33 cf54341ae6
commit 7abbc44474
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java
View File

@ -22,6 +22,7 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import org.eclipse.jetty.util.component.Destroyable;
import org.eclipse.jetty.util.component.LifeCycle; import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.log.Logger;
@ -79,7 +80,7 @@ public class ShutdownThread extends Thread
catch(Exception e) catch(Exception e)
{ {
LOG.ignore(e); LOG.ignore(e);
LOG.info("shutdown already commenced"); LOG.debug("shutdown already commenced");
} }
} }
@ -131,6 +132,12 @@ public class ShutdownThread extends Thread
lifeCycle.stop(); lifeCycle.stop();
LOG.debug("Stopped {}",lifeCycle); LOG.debug("Stopped {}",lifeCycle);
} }
if (lifeCycle instanceof Destroyable)
{
((Destroyable)lifeCycle).destroy();
LOG.debug("Destroyed {}",lifeCycle);
}
} }
catch (Exception ex) catch (Exception ex)
{ {