[geode] branch develop updated: GEODE-5480: Changing wait blocks to use a while loop

[upthewaterspout]

This is an automated email from the ASF dual-hosted git repository.

upthewaterspout pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new 0a9da64  GEODE-5480: Changing wait blocks to use a while loop
0a9da64 is described below

commit 0a9da64bc2cca0cc4e7cd6b889df85ace99dc8a7
Author: Kirk Lund <kl...@pivotal.io>
AuthorDate: Fri Aug 10 12:24:25 2018 -0700

    GEODE-5480: Changing wait blocks to use a while loop
    
    This test has many wait blocks that just used an if. So if the thread
    was notified by some other event, it would leave the wait without the
    expected event being delivered.
---
 ...niversalMembershipListenerAdapterDUnitTest.java | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git 
a/geode-core/src/distributedTest/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
 
b/geode-core/src/distributedTest/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
index f3c5040..683d2e0 100644
--- 
a/geode-core/src/distributedTest/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
+++ 
b/geode-core/src/distributedTest/java/org/apache/geode/management/UniversalMembershipListenerAdapterDUnitTest.java
@@ -585,17 +585,17 @@ public class UniversalMembershipListenerAdapterDUnitTest 
extends ClientServerTes
 
     // should trigger both adapter and bridge listener but not system listener
     synchronized (adapter) {
-      if (!firedAdapter[JOINED]) {
+      while (!firedAdapter[JOINED]) {
         adapter.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
     synchronized (bridgeListener) {
-      if (!firedBridge[JOINED]) {
+      while (!firedBridge[JOINED]) {
         bridgeListener.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
     synchronized (systemListener) {
-      if (!firedSystem[JOINED]) {
+      while (!firedSystem[JOINED]) {
         systemListener.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
@@ -665,12 +665,12 @@ public class UniversalMembershipListenerAdapterDUnitTest 
extends ClientServerTes
     });
 
     synchronized (adapter) {
-      if (!firedAdapter[LEFT]) {
+      while (!firedAdapter[LEFT]) {
         adapter.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
     synchronized (bridgeListener) {
-      if (!firedBridge[LEFT]) {
+      while (!firedBridge[LEFT]) {
         bridgeListener.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
@@ -726,12 +726,12 @@ public class UniversalMembershipListenerAdapterDUnitTest 
extends ClientServerTes
     clientMemberId = clientMember.getId();
 
     synchronized (adapter) {
-      if (!firedAdapter[JOINED]) {
+      while (!firedAdapter[JOINED]) {
         adapter.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
     synchronized (bridgeListener) {
-      if (!firedBridge[JOINED]) {
+      while (!firedBridge[JOINED]) {
         bridgeListener.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
@@ -801,17 +801,17 @@ public class UniversalMembershipListenerAdapterDUnitTest 
extends ClientServerTes
     });
 
     synchronized (adapter) {
-      if (!firedAdapter[LEFT]) {
+      while (!firedAdapter[LEFT]) {
         adapter.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
     synchronized (systemListener) {
-      if (!firedSystem[LEFT]) {
+      while (!firedSystem[LEFT]) {
         systemListener.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
     synchronized (bridgeListener) {
-      if (!firedBridge[LEFT]) {
+      while (!firedBridge[LEFT]) {
         bridgeListener.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
@@ -867,17 +867,17 @@ public class UniversalMembershipListenerAdapterDUnitTest 
extends ClientServerTes
     clientMemberId = clientMember.getId();
 
     synchronized (adapter) {
-      if (!firedAdapter[JOINED]) {
+      while (!firedAdapter[JOINED]) {
         adapter.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
     synchronized (systemListener) {
-      if (!firedSystem[JOINED]) {
+      while (!firedSystem[JOINED]) {
         systemListener.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
     synchronized (bridgeListener) {
-      if (!firedBridge[JOINED]) {
+      while (!firedBridge[JOINED]) {
         bridgeListener.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
@@ -949,12 +949,12 @@ public class UniversalMembershipListenerAdapterDUnitTest 
extends ClientServerTes
     });
 
     synchronized (adapter) {
-      if (!firedAdapter[CRASHED]) {
+      while (!firedAdapter[CRASHED]) {
         adapter.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }
     synchronized (bridgeListener) {
-      if (!firedBridge[CRASHED]) {
+      while (!firedBridge[CRASHED]) {
         bridgeListener.wait(ASYNC_EVENT_WAIT_MILLIS);
       }
     }