Merge pull request javaee-samples#427 from flowlogix/JMS-Fix

Fix race condition in jms/send-receive

Author: arjantijms

jms/send-receive/src/test/java/org/javaee7/jms/send/receive/mdb/ReceptionSynchronizer.java

@@ -56,6 +56,8 @@ void registerInvocation(Method m) {
         synchronized (barrier) {
             if (barrier.containsKey(m)) {
                 latch = barrier.get(m);
+            } else {
+                barrier.put(m, new CountDownLatch(0));
             }
         }
         if (latch != null) {
@@ -85,11 +87,6 @@ private static void waitFor(Method method, int timeoutInMillis) throws Interrupt
         synchronized (barrier) {
             if (barrier.containsKey(method)) {
                 latch = barrier.get(method);
-                if (latch.getCount() == 0) {
-                    throw new IllegalStateException("The invocation already happened");
-                } else {
-                    throw new IllegalStateException("Sorry, I only serve the first one");
-                }
             } else {
                 latch = new CountDownLatch(1);
                 barrier.put(method, latch);
@@ -99,5 +96,4 @@ private static void waitFor(Method method, int timeoutInMillis) throws Interrupt
             throw new AssertionError("Expected method has not been invoked in " + timeoutInMillis + "ms");
         }
     }
-
 }