[jboss-cvs] JBoss Messaging SVN: r6607 - in trunk: tests/src/org/jboss/messaging/tests/unit/core/paging/impl and 1 other directories.

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

Author: timfox
Date: 2009-04-28 15:13:52 -0400 (Tue, 28 Apr 2009)
New Revision: 6607

Modified:
   trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/BindingImplTest.java
Log:
https://jira.jboss.org/jira/browse/JBMESSAGING-1551

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-28 19:04:26 UTC (rev 6606)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java	2009-04-28 19:13:52 UTC (rev 6607)
@@ -679,7 +679,7 @@
 
       Transaction tx = new TransactionImpl(storageManager);
 
-      boolean routed = postOffice.redistribute(reference.getMessage(), queue.getName(), tx);
+      boolean routed = postOffice.redistribute(reference.getMessage(), queue, tx);
 
       if (routed)
       {

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java	2009-04-28 19:04:26 UTC (rev 6606)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java	2009-04-28 19:13:52 UTC (rev 6607)
@@ -1237,7 +1237,7 @@
       /* (non-Javadoc)
        * @see org.jboss.messaging.core.postoffice.PostOffice#redistribute(org.jboss.messaging.core.server.ServerMessage, org.jboss.messaging.utils.SimpleString, org.jboss.messaging.core.transaction.Transaction)
        */
-      public boolean redistribute(final ServerMessage message, final SimpleString routingName, final Transaction tx) throws Exception
+      public boolean redistribute(final ServerMessage message, final Queue queue, final Transaction tx) throws Exception
       {
          return false;
       }

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/BindingImplTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/BindingImplTest.java	2009-04-28 19:04:26 UTC (rev 6606)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/postoffice/impl/BindingImplTest.java	2009-04-28 19:13:52 UTC (rev 6607)
@@ -112,14 +112,7 @@
 
       for (int i = 0; i < 100; i++)
       {
-         if (route)
-         {
-            bind.route(new FakeMessage(), new FakeTransaction());
-         }
-         else
-         {
-            bind.redistribute(new FakeMessage(), new SimpleString("a"), new FakeTransaction());
-         }
+         bind.route(new FakeMessage(), new FakeTransaction());
       }
    }