svn commit: r924776 - in /tomcat/trunk/java/org/apache/catalina/tribes/transport: ReplicationTransmitter.java nio/PooledParallelSender.java

[fhanik]

Author: fhanik
Date: Thu Mar 18 13:54:27 2010
New Revision: 924776

URL: http://svn.apache.org/viewvc?rev=924776&view=rev
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=48934
The wrong sender was disconnected, should only be the sender holding the actual 
TCP connections.


Modified:
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
    
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java?rev=924776&r1=924775&r2=924776&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/ReplicationTransmitter.java
 Thu Mar 18 13:54:27 2010
@@ -76,12 +76,7 @@ public class ReplicationTransmitter impl
      */
     public void sendMessage(ChannelMessage message, Member[] destination) 
throws ChannelException {
         MultiPointSender sender = getTransport();
-        try {
-            sender.sendMessage(destination,message);
-        }catch (ChannelException x) {
-            sender.disconnect();
-            throw x;
-        }
+        sender.sendMessage(destination,message);
     }
     
     

Modified: 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java?rev=924776&r1=924775&r2=924776&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
 (original)
+++ 
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/PooledParallelSender.java
 Thu Mar 18 13:54:27 2010
@@ -52,9 +52,12 @@ public class PooledParallelSender extend
             try {
                 sender.sendMessage(destination, message);
                 sender.keepalive();
+            } catch (ChannelException x) {
+                sender.disconnect();
+                throw x;
             } finally {
-                if (!connected) disconnect();
                 returnSender(sender);
+                if (!connected) disconnect();
             }
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org