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

312526 Protect shutdown thread initialization during shutdown 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@1774 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
Greg Wilkins 2010-05-14 06:48:27 +00:00
parent 9fbd9a912d
commit 11cef96193
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
VERSION.txt
View File

@ -12,9 +12,10 @@ jetty-7.1.1-SNAPSHOT
+ 308858 Update test suite to JUnit4 - Module jetty-plus
+ 308863 Update test suite to JUnit4 - Module jetty-servlet
+ 308855 Update test suite to JUnit4 - Module jetty-io
+ 310918 Fixed write blocking for client HttpConnection
+ 308862 Update test suite to JUnit4 - Module jetty-server
+ 308867 Update test suite to JUnit4 - Module jetty-webapp
+ 310918 Fixed write blocking for client HttpConnection
+ 312526 Protect shutdown thread initialization during shutdown
jetty-7.1.0 5 May 2010
+ 306353 fixed cross context dispatch to root context.

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

@ -45,7 +45,15 @@ public class ShutdownThread extends Thread
*/
private ShutdownThread()
{
Runtime.getRuntime().addShutdownHook(this);
try
{
Runtime.getRuntime().addShutdownHook(this);
}
catch(Exception e)
{
Log.ignore(e);
Log.info("shutdown already commenced");
}
}
/* ------------------------------------------------------------ */
@ -100,4 +108,4 @@ public class ShutdownThread extends Thread
{
return _thread;
}
}
}