I can do multithreaded programming in Java, honest...

Author: Matthew Sackman

test/src/com/rabbitmq/client/test/functional/ConsumerCancelNotificiation.java

@@ -32,7 +32,7 @@ public class ConsumerCancelNotificiation extends BrokerTestCase {
 
     private void assertNotified(boolean expected, boolean wait) {
         synchronized (lock) {
-            if (wait) {
+            if (wait && (expected != notified)) {
                 try {
                     lock.wait();
                 } catch (InterruptedException e) {