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

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

Author: clebert.suconic at jboss.com
Date: 2007-02-27 18:07:31 -0500 (Tue, 27 Feb 2007)
New Revision: 2478

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

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 22:53:55 UTC (rev 2477)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MergeQueueTest.java	2007-02-27 23:07:31 UTC (rev 2478)
@@ -144,8 +144,6 @@
       Connection conn0 = null;
       Connection conn1 = null;
 
-      int numberOfMessagesReceived = 0;
-
       try
       {
 
@@ -209,8 +207,10 @@
          MessageConsumer consumer1 = session1.createConsumer(queue[1]);
 
          ServerManagement.killAndWait(1);
-         waitForFailoverComplete(1, conn1);
 
+         // close the consumer .. .and this should cause failover to kick in
+         consumer1.close();
+
          consumer0 = session0.createConsumer(queue[0]);
          for (int i = 5; i < 20; i++)
          {