Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

2011-10-19 15:21:57 +11:00 · 2011-10-19 15:21:57 +11:00 · acc1b19228
parent d63577b4e9 d71fd55665
commit acc1b19228
1 changed files with 4 additions and 5 deletions
--- a/jetty-util/src/main/java/org/eclipse/jetty/util/log/Log.java
+++ b/jetty-util/src/main/java/org/eclipse/jetty/util/log/Log.java
@ -80,12 +80,11 @@ public class Log
                __log.debug("Logging to {} via {}", __log, log_class.getName());
            }
        }
-        catch(NoClassDefFoundError e)
-        {
-            initStandardLogging(e);
-        }
-        catch(Exception e)
+        catch(Throwable e)
        {
+            if (e instanceof ThreadDeath)
+                throw (ThreadDeath)e;
+            
            initStandardLogging(e);
        }