[jboss-cvs] JBoss Messaging SVN: r1373 - trunk/tests/src/org/jboss/test/messaging/core/local/base

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

Author: timfox
Date: 2006-09-28 07:55:53 -0400 (Thu, 28 Sep 2006)
New Revision: 1373

Modified:
   trunk/tests/src/org/jboss/test/messaging/core/local/base/PagingFilteredQueueTestBase.java
Log:
resolved a conflict


Modified: trunk/tests/src/org/jboss/test/messaging/core/local/base/PagingFilteredQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/local/base/PagingFilteredQueueTestBase.java	2006-09-28 11:44:25 UTC (rev 1372)
+++ trunk/tests/src/org/jboss/test/messaging/core/local/base/PagingFilteredQueueTestBase.java	2006-09-28 11:55:53 UTC (rev 1373)
@@ -198,11 +198,11 @@
             
       PagingFilteredQueue queue = new PagingFilteredQueue("queue1", 1, ms, pm, true, false, new QueuedExecutor(), f);
       
-      Message m1 = new CoreMessage(1, false, 0, 0, (byte)0, null, null, 0);
-      Message m2 = new CoreMessage(2, false, 0, 0, (byte)0, null, null, 0);
-      Message m3 = new CoreMessage(3, false, 0, 0, (byte)0, null, null, 0);
-      Message m4 = new CoreMessage(4, false, 0, 0, (byte)0, null, null, 0);
-      Message m5 = new CoreMessage(5, false, 0, 0, (byte)0, null, null, 0);
+      Message m1 = new CoreMessage(1, false, 0, 0, (byte)0, null, null);
+      Message m2 = new CoreMessage(2, false, 0, 0, (byte)0, null, null);
+      Message m3 = new CoreMessage(3, false, 0, 0, (byte)0, null, null);
+      Message m4 = new CoreMessage(4, false, 0, 0, (byte)0, null, null);
+      Message m5 = new CoreMessage(5, false, 0, 0, (byte)0, null, null);
       
       MessageReference ref1 = ms.reference(m1);
       MessageReference ref2 = ms.reference(m2);