Author: markt
Date: Sat Dec 11 22:20:10 2010
New Revision: 1044730
URL: http://svn.apache.org/viewvc?rev=1044730&view=rev
Log:
Tribes should only depend on JULI
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=1044730&r1=1044729&r2=1044730&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/McastServiceImpl.java
Sat Dec 11 22:20:10 2010
@@ -36,7 +36,6 @@ import org.apache.catalina.tribes.Messag
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);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java?rev=1044730&r1=1044729&r2=1044730&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReceiver.java
Sat Dec 11 22:20:10 2010
@@ -39,7 +39,6 @@ import org.apache.catalina.tribes.transp
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 Receive
// 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);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
