From 11cef961939c96689acfb0132dd292c9ad35cfe0 Mon Sep 17 00:00:00 2001
From: Greg Wilkins
Date: Fri, 14 May 2010 06:48:27 +0000
Subject: 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
---
 VERSION.txt                                                  |  3 ++-
 .../java/org/eclipse/jetty/util/thread/ShutdownThread.java   | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/VERSION.txt b/VERSION.txt
index afa1c480a0..0109ef5e66 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -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.
diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java
index c45cb6609e..58f363d515 100644
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/thread/ShutdownThread.java
@@ -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;
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3