361319 Log initialization does not catch correct exceptions on all jvms

2011-10-19 12:28:23 +11:00 · 2011-10-19 12:28:23 +11:00 · d71fd55665
parent e9c398e86b
commit d71fd55665
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);
        }