killbill-aplcache

jaxrs: add workaround for race conditions in TestResource Signed-off-by:

2/17/2015 8:06:42 PM

Details

diff --git a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TestResource.java b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TestResource.java
index 7c983f1..ea85da5 100644
--- a/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TestResource.java
+++ b/jaxrs/src/main/java/org/killbill/billing/jaxrs/resources/TestResource.java
@@ -219,6 +219,7 @@ public class TestResource extends JaxRsResourceBase {
                 areAllNotificationsProcessed = areAllNotificationsProcessed && areAllBusEventsProcessed(tenantRecordId);
                 // We do a re-check of the notification queues in case of race conditions.
                 areAllNotificationsProcessed = areAllNotificationsProcessed && areAllNotificationsProcessed(tenantRecordId);
+                areAllNotificationsProcessed = areAllNotificationsProcessed && areAllBusEventsProcessed(tenantRecordId);
                 if (!areAllNotificationsProcessed) {
                     Thread.sleep(MILLIS_IN_SEC);
                     nbTryLeft--;