From d71fd556654643a89d916f6ed97a91c803095335 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 19 Oct 2011 12:28:23 +1100 Subject: [PATCH] 361319 Log initialization does not catch correct exceptions on all jvms --- .../src/main/java/org/eclipse/jetty/util/log/Log.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git 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 index a1130ab6043..95bafcec4d8 100644 --- 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); }