Author: fhanik
Date: Wed Jun 13 10:07:06 2007
New Revision: 546959
URL: http://svn.apache.org/viewvc?view=rev&rev=546959
Log:
fix for BZ 42650
http://issues.apache.org/bugzilla/show_bug.cgi?id=42650
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?view=diff&rev=546959&r1=546958&r2=546959
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
Wed Jun 13 10:07:06 2007
@@ -44,12 +44,18 @@
public void sendMessage(Member[] destination, ChannelMessage message)
throws ChannelException {
if ( !connected ) throw new ChannelException("Sender not connected.");
ParallelNioSender sender = (ParallelNioSender)getSender();
- try {
- sender.sendMessage(destination, message);
- sender.keepalive();
- }finally {
- if ( !connected ) disconnect();
- returnSender(sender);
+ if (sender == null) {
+ ChannelException cx = new ChannelException("Unable to retrieve a
data sender, time out error.");
+ for (int i = 0; i < destination.length; i++)
cx.addFaultyMember(destination[i], new NullPointerException("Unable to retrieve
a sender from the sender pool"));
+ throw cx;
+ } else {
+ try {
+ sender.sendMessage(destination, message);
+ sender.keepalive();
+ } finally {
+ if (!connected) disconnect();
+ returnSender(sender);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
