GroupRequest: moved checkCompletion() into lock scope (https://issues…

….jboss.org/browse/JGRP-2026)
belaban · Mar 15, 2016 · 47530ce · 47530ce
1 parent 51bb6e1
commit 47530ce
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/src/org/jgroups/blocks/GroupRequest.java b/src/org/jgroups/blocks/GroupRequest.java
@@ -134,23 +134,21 @@ public void suspect(Address suspected_member) {
 
         boolean changed=false;
         Rsp<T> rsp=requests.get(suspected_member);
-        if(rsp !=  null) {
+        if(rsp != null) {
             if(rsp.setSuspected()) {
                 changed=true;
                 lock.lock();
                 try {
                     if(!(rsp.wasReceived() || rsp.wasUnreachable()))
                         num_received++;
                     cond.signal(true);
+                    checkCompletion(this);
                 }
                 finally {
                     lock.unlock();
                 }
             }
         }
-
-        if(changed)
-            checkCompletion(this);
     }
 
     public void siteUnreachable(String site) {
@@ -171,15 +169,13 @@ public void siteUnreachable(String site) {
                             if(!(rsp.wasReceived() || rsp.wasSuspected()))
                                 num_received++;
                             cond.signal(true);
+                            checkCompletion(this);
                         }
                         finally {
                             lock.unlock();
                         }
                     }
                 }
-
-                if(changed)
-                    checkCompletion(this);
             }
         }
     }
@@ -225,14 +221,14 @@ public void viewChange(View new_view) {
                     }
                 }
             }
-            if(changed)
+            if(changed) {
                 cond.signal(true);
+                checkCompletion(this);
+            }
         }
         finally {
             lock.unlock();
         }
-        if(changed)
-            checkCompletion(this);
     }
 
     /** Marks all responses with an exception (unless a response was already marked as done) */
@@ -251,13 +247,12 @@ public void transportClosed() {
             }
             if(changed) {
                 cond.signal(true);
+                checkCompletion(this);
             }
         }
         finally {
             lock.unlock();
         }
-        if(changed)
-            checkCompletion(this);
     }
 
     /* -------------------- End of Interface RspCollector ----------------------------------- */

diff --git a/src/org/jgroups/blocks/UnicastRequest.java b/src/org/jgroups/blocks/UnicastRequest.java
@@ -67,12 +67,12 @@ public void receiveResponse(Object response_value, Address sender, boolean is_ex
             done=responsesComplete() || (rsp_filter != null && !rsp_filter.needMoreResponses());
             if(done && corr != null && this.req_id > 0)
                 corr.done(this.req_id);
+            checkCompletion(this);
         }
         finally {
             cond.signal(true); // wakes up execute()
             lock.unlock();
         }
-        checkCompletion(this);
     }
 
     public boolean responseReceived() {return num_received >= 1;}
@@ -98,11 +98,11 @@ public void suspect(Address suspected_member) {
             if(corr != null && this.req_id > 0)
                 corr.done(this.req_id);
             cond.signal(true);
+            checkCompletion(this);
         }
         finally {
             lock.unlock();
         }
-        checkCompletion(this);
     }
 
     public void siteUnreachable(String site) {
@@ -122,11 +122,11 @@ public void siteUnreachable(String site) {
             if(corr != null && this.req_id > 0)
                 corr.done(this.req_id);
             cond.signal(true);
+            checkCompletion(this);
         }
         finally {
             lock.unlock();
         }
-        checkCompletion(this);
     }
 
     /**
@@ -147,13 +147,12 @@ public void viewChange(View new_view) {
                 if(corr != null && this.req_id > 0)
                     corr.done(this.req_id);
                 cond.signal(true);
+                checkCompletion(this);
             }
         }
         finally {
             lock.unlock();
         }
-
-        checkCompletion(this);
     }
 
     public void transportClosed() {
@@ -167,11 +166,11 @@ public void transportClosed() {
             if(corr != null && this.req_id > 0)
                 corr.done(this.req_id);
             cond.signal(true);
+            checkCompletion(this);
         }
         finally {
             lock.unlock();
         }
-        checkCompletion(this);
     }
 
     /* -------------------- End of Interface RspCollector ----------------------------------- */