From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 11 Dec 2010 22:20:10 +0000 (+0000)
Subject: Tribes should only depend on JULI
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=86c32cd6baafa14db5085964a4b3d8df20019c25;p=tomcat7.0

Tribes should only depend on JULI

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044730 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
index a1f200eba..18cf6886e 100644
--- a/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
+++ b/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
@@ -36,7 +36,6 @@ import org.apache.catalina.tribes.MessageListener;
 import org.apache.catalina.tribes.io.ChannelData;
 import org.apache.catalina.tribes.io.XByteBuffer;
 import org.apache.catalina.tribes.util.ExecutorFactory;
-import org.apache.tomcat.util.ExceptionUtils;
 
 /**
  * A <b>membership</b> implementation using simple multicast.
@@ -422,7 +421,12 @@ public class McastServiceImpl
                                     msgservice.messageReceived(data[i]);
                                 }
                             } catch (Throwable t) {
-                                ExceptionUtils.handleThrowable(t);
+                                if (t instanceof ThreadDeath) {
+                                    throw (ThreadDeath) t;
+                                }
+                                if (t instanceof VirtualMachineError) {
+                                    throw (VirtualMachineError) t;
+                                }
                                 log.error("Unable to receive broadcast message.",t);
                             }
                         }
diff --git a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
index 16bd00d68..14aa37ef6 100644
--- a/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
+++ b/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
@@ -39,7 +39,6 @@ import org.apache.catalina.tribes.transport.RxTaskPool;
 import org.apache.catalina.tribes.util.StringManager;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
-import org.apache.tomcat.util.ExceptionUtils;
 
 /**
  * @author Filip Hanik
@@ -318,9 +317,14 @@ public class NioReceiver extends ReceiverBase implements Runnable {
                 // ignore is normal at shutdown or stop listen socket
             } catch (java.nio.channels.CancelledKeyException nx) {
                 log.warn("Replication client disconnected, error when polling key. Ignoring client.");
-            } catch (Throwable x) {
-                ExceptionUtils.handleThrowable(x);
-                log.error("Unable to process request in NioReceiver", x);
+            } catch (Throwable t) {
+                if (t instanceof ThreadDeath) {
+                    throw (ThreadDeath) t;
+                }
+                if (t instanceof VirtualMachineError) {
+                    throw (VirtualMachineError) t;
+                }
+                log.error("Unable to process request in NioReceiver", t);
             }
 
         }