Comments and changes from review

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/broker-queue-refactor@661395 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 7 deletions

diff --git a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
index 6e19f53ffe..9572c82472 100644
--- a/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
+++ b/java/client/src/test/java/org/apache/qpid/client/MessageListenerMultiConsumerTest.java
@@ -215,23 +215,26 @@ public class MessageListenerMultiConsumerTest extends TestCase
         {
             _logger.info("Performing Receive only with two consumers on one session ");
 
-            MessageConsumer consumer2 = _clientSession1.createConsumer(_queue);
 
-            for (int msg = 0; msg < (MSG_COUNT / 2); msg++)
+            int msg;
+            for (msg = 0; msg < (MSG_COUNT / 2); msg++)
             {
 
 
-                final Message message = _consumer1.receive(100000);
+                final Message message = _consumer1.receive(1000);
                 if(message == null)
                 {
-                    System.out.println("!!!!!!!!   " + msg);
+                    break;
                 }
-                assertTrue(message != null);
+
             }
 
-            for (int msg = 0; msg < (MSG_COUNT / 2); msg++)
+            _consumer1.close();
+            _clientSession1.close();
+
+            for (; msg < MSG_COUNT ; msg++)
             {
-                assertTrue(consumer2.receive(10000) != null);
+                assertTrue("Failed at msg id" + msg, _consumer2.receive(1000) != null);
             }
         }
         else