tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fha...@apache.org
Subject svn commit: r416806 - in /tomcat/container/tc5.5.x/modules/groupcom: ./ src/share/org/apache/catalina/tribes/group/interceptors/ src/share/org/apache/catalina/tribes/membership/
Date Fri, 23 Jun 2006 19:43:21 GMT
Author: fhanik
Date: Fri Jun 23 12:43:21 2006
New Revision: 416806

URL: http://svn.apache.org/viewvc?rev=416806&view=rev
Log:
Fixed some bugs

Modified:
    tomcat/container/tc5.5.x/modules/groupcom/VERSION
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
    tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java

Modified: tomcat/container/tc5.5.x/modules/groupcom/VERSION
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/VERSION?rev=416806&r1=416805&r2=416806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/VERSION (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/VERSION Fri Jun 23 12:43:21 2006
@@ -1,3 +1,5 @@
+0.9.3.0
+  - fixed bugs
 0.9.2.9
   - jdk1.4 support for buffer pools
 0.9.2.8

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java?rev=416806&r1=416805&r2=416806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/MessageDispatchInterceptor.java
Fri Jun 23 12:43:21 2006
@@ -151,7 +151,7 @@
         //stop the thread
         if ( run ) {
             synchronized (this) {
-                if ( run && ((svc & Channel.SND_TX_SEQ)==svc)) {
+                if ( run && ((svc & Channel.SND_TX_SEQ)==Channel.SND_TX_SEQ))
{
                     stopQueue();
                 }//end if
             }//sync

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=416806&r1=416805&r2=416806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Fri Jun 23 12:43:21 2006
@@ -150,7 +150,13 @@
                 removeSuspects.put(member, new Long(System.currentTimeMillis()));
             }
         }
-        if ( notify ) super.memberDisappeared(member);
+        if ( notify ) {
+            log.info("Verification complete. Member disappeared["+member+"]");
+            super.memberDisappeared(member);
+        } else {
+            log.info("Verification complete. Member still alive["+member+"]");
+
+        }
     }
     
     public boolean hasMembers() {

Modified: tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java?rev=416806&r1=416805&r2=416806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
(original)
+++ tomcat/container/tc5.5.x/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastServiceImpl.java
Fri Jun 23 12:43:21 2006
@@ -202,7 +202,7 @@
             if ( sender != null ) throw new IllegalStateException("McastService.send already
running.");
             if ( receiver == null ) socket.joinGroup(address);
             //make sure at least one packet gets out there
-            send();
+            send(false);
             doRunSender = true;
             serviceStartTime = System.currentTimeMillis();
             sender = new SenderThread(sendFrequency);
@@ -258,7 +258,7 @@
             byte[] payload = member.getPayload();
             member.setPayload(Member.SHUTDOWN_PAYLOAD);
             member.getData(true, true);
-            send();
+            send(false);
             //restore payload
             member.setPayload(payload);
             member.getData(true, true);
@@ -333,7 +333,7 @@
      * Send a ping
      * @throws Exception
      */ 
-    public void send() throws IOException{
+    public void send(boolean checkexpired) throws IOException{
         member.inc();
         if(log.isDebugEnabled())
             log.debug("Mcast send ping from member " + member);
@@ -342,7 +342,7 @@
         p.setAddress(address);
         p.setPort(port);
         socket.send(p);
-        checkExpired();
+        if ( checkexpired ) checkExpired();
     }
 
     public long getServiceStartTime() {
@@ -378,7 +378,7 @@
         public void run() {
             while ( doRunSender ) {
                 try {
-                    send();
+                    send(true);
                 } catch ( Exception x ) {
                     log.warn("Unable to send mcast message.",x);
                 }



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


Mime
View raw message