[jboss-cvs] JBoss Messaging SVN: r7149 - in trunk: tests/src/org/jboss/messaging/tests/integration/cluster/distribution and 1 other directory.

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

Author: jmesnil
Date: 2009-06-01 07:48:15 -0400 (Mon, 01 Jun 2009)
New Revision: 7149

Modified:
   trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageRedistributionTest.java
Log:
queue redistribution fix

* do not create a redistributor if there is already a running instance

Modified: trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java	2009-06-01 11:47:05 UTC (rev 7148)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/QueueImpl.java	2009-06-01 11:48:15 UTC (rev 7149)
@@ -1050,7 +1050,8 @@
 
    private void internalAddRedistributor(final Executor executor, final Channel replicatingChannel)
    {
-      if (consumers.size() == 0)
+      // create the redistributor only once if there are no local consumers
+      if (consumers.size() == 0 && redistributor == null)
       {
          redistributor = new Redistributor(this,
                                            storageManager,

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageRedistributionTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageRedistributionTest.java	2009-06-01 11:47:05 UTC (rev 7148)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/distribution/MessageRedistributionTest.java	2009-06-01 11:48:15 UTC (rev 7149)
@@ -37,7 +37,7 @@
  */
 public class MessageRedistributionTest extends ClusterTestBase
 {
-   private static final Logger log = Logger.getLogger(SymmetricClusterTest.class);
+   private static final Logger log = Logger.getLogger(MessageRedistributionTest.class);
 
    @Override
    protected void setUp() throws Exception