Attachment 24253 Details for Bug 46384 – Updated patch for this issue

[patch] Updated patch for this issue

bug46384-v2.patch (text/plain), 1.57 KB, created by Mark Thomas on 2009-09-13 11:14:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Thomas

Created: 2009-09-13 11:14:42 UTC

Size: 1.57 KB

patch

obsolete

>Index: container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java
>===================================================================
>--- container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java	(revision 813436)
>+++ container/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastServiceImpl.java	(working copy)
>@@ -265,23 +265,25 @@
>             McastMember m = McastMember.getMember(data);
>             if(log.isDebugEnabled())
>                 log.debug("Mcast receive ping from member " + m);
>-            if ( membership.memberAlive(m) ) {
>-                if(log.isDebugEnabled())
>-                    log.debug("Mcast add member " + m);
>-                service.memberAdded(m);
>+            synchronized (membershipMutex) {
>+                if ( membership.memberAlive(m) ) {
>+                    if(log.isDebugEnabled())
>+                        log.debug("Mcast add member " + m);
>+                    service.memberAdded(m);
>+                }
>             }
>         } finally {
>             checkExpire();
>         }
>     }
> 
>-    protected Object expiredMutex = new Object();
>+    protected final Object membershipMutex = new Object();
> 
>     /**
>      * check member expire or alive
>      */
>     protected void checkExpire() {
>-        synchronized (expiredMutex) {
>+        synchronized (membershipMutex) {
>             McastMember[] expired = membership.expire(timeToExpiration);
>             for ( int i=0; i<expired.length; i++) {
>                 if(log.isDebugEnabled())

Actions: View | Diff

Attachments on bug 46384: 23501 | 24253