svn commit: r385608 - in /tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio: ParallelNioSender.java PooledParallelSender.java

[fhanik]

Author: fhanik
Date: Mon Mar 13 10:11:41 2006
New Revision: 385608

URL: http://svn.apache.org/viewcvs?rev=385608&view=rev
Log:
minor changes, implemented checkKeepAlive on the parallelniosender

Modified:
    
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java
    
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/PooledParallelSender.java

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java?rev=385608&r1=385607&r2=385608&view=diff
==============================================================================
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/ParallelNioSender.java
 Mon Mar 13 10:11:41 2006
@@ -28,6 +28,7 @@
 import org.apache.catalina.tribes.io.ClusterData;
 import org.apache.catalina.tribes.io.XByteBuffer;
 import org.apache.catalina.tribes.tcp.MultiPointSender;
+import java.util.Map;
 
 /**
  * <p>Title: </p>
@@ -210,6 +211,8 @@
     
     public void memberRemoved(Member member) {
         //disconnect senders
+        NioSender sender = (NioSender)nioSenders.remove(member);
+        if ( sender != null ) sender.disconnect();
     }
 
     
@@ -272,7 +275,15 @@
 
     public boolean checkKeepAlive() {
         //throw new UnsupportedOperationException("Method 
ParallelNioSender.checkKeepAlive() not implemented");
-        return false;
+        boolean result = false;
+        Map.Entry[] entries = (Map.Entry[])nioSenders.entrySet().toArray(new 
Map.Entry[nioSenders.size()]);
+        for ( int i=0; i<entries.length; i++ ) {
+            NioSender sender = (NioSender)entries[i].getValue();
+            if ( sender.checkKeepAlive() ) {
+                nioSenders.remove(sender.getDestination());
+            }
+        }
+        return result;
     }
 
 }

Modified: 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/PooledParallelSender.java
URL: 
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/PooledParallelSender.java?rev=385608&r1=385607&r2=385608&view=diff
==============================================================================
--- 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/PooledParallelSender.java
 (original)
+++ 
tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/tcp/nio/PooledParallelSender.java
 Mon Mar 13 10:11:41 2006
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999,2004-2005 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]