[hornetq-commits] JBoss hornetq SVN: r9691 - in branches/Branch_2_1: tests/src/org/hornetq/tests/integration/client and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-09-15 10:36:37 -0400 (Wed, 15 Sep 2010)
New Revision: 9691

Modified:
   branches/Branch_2_1/merge-activity.txt
   branches/Branch_2_1/tests/src/org/hornetq/tests/integration/client/PagingTest.java
Log:
tweak on paging-test (sync from trunk)

Modified: branches/Branch_2_1/merge-activity.txt
===================================================================
--- branches/Branch_2_1/merge-activity.txt	2010-09-15 14:25:44 UTC (rev 9690)
+++ branches/Branch_2_1/merge-activity.txt	2010-09-15 14:36:37 UTC (rev 9691)
@@ -18,5 +18,7 @@
 - 14-sep-2010 - jmesnil        - merger from trunk -r 9682:9683 - https://jira.jboss.org/browse/HORNETQ-509
 
 - 14-sep-2010 - clebert        - merger from trunk -r 9685:9686
+
+- 15-sep-2010 - clebert        - merger from trunk -r 9689:9690 - tweak on PagingTest
  
 TODO: Bring changes from HORNETQ-469 as soon as it's stable (remove this line as soon as it's done)

Modified: branches/Branch_2_1/tests/src/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- branches/Branch_2_1/tests/src/org/hornetq/tests/integration/client/PagingTest.java	2010-09-15 14:25:44 UTC (rev 9690)
+++ branches/Branch_2_1/tests/src/org/hornetq/tests/integration/client/PagingTest.java	2010-09-15 14:36:37 UTC (rev 9691)
@@ -34,7 +34,6 @@
 import org.hornetq.core.config.Configuration;
 import org.hornetq.core.config.DivertConfiguration;
 import org.hornetq.core.logging.Logger;
-import org.hornetq.core.paging.impl.PageTransactionInfoImpl;
 import org.hornetq.core.paging.impl.TestSupportPageStore;
 import org.hornetq.core.server.HornetQServer;
 import org.hornetq.core.server.Queue;
@@ -268,8 +267,10 @@
             threads[i].join();
          }
          
+         assertEquals(0, errors.get());
+         
          assertEquals(0, server.getPostOffice().getPagingManager().getTransactions().size());
-
+         
       }
       finally
       {