[jboss-cvs] JBoss Messaging SVN: r2479 - trunk/tests/src/org/jboss/test/messaging/jms/clustering.

[jboss-cvs-commits at lists.jboss.org]

Author: timfox
Date: 2007-02-27 18:25:13 -0500 (Tue, 27 Feb 2007)
New Revision: 2479

Modified:
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
Log:
few tweaks


Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java	2007-02-27 23:07:31 UTC (rev 2478)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java	2007-02-27 23:25:13 UTC (rev 2479)
@@ -578,24 +578,27 @@
          cons1.close();
          
          cons1 = null;
+         
+         if (fillConsumer)
+         {
+            //Creating the consumer immediately after kill should ensure that all the messages are in the consumer and
+            //not paged to disk
+            cons0 = session0.createConsumer(queue0);
+         }
                  
          //Now kill the server
 
          waitForFailoverComplete(1, conn1);
-
-         //Messages should all be available on node 0
          
-         conn0.start();
-                  
          if (!fillConsumer)
          {
-            Thread.sleep(5000);
+            cons0 = session0.createConsumer(queue0);
          }
+
+         //Messages should all be available on node 0
          
-         //Creating the consumer immediately after kill should ensure that all the messages are in the consumer and
-         //not paged to disk
-         cons0 = session0.createConsumer(queue0);
-                           
+         conn0.start();                 
+                                    
          log.info("now consuming");
          for (int i = 0; i < messages0 + messages1; i++)
          {