[jboss-cvs] JBoss Messaging SVN: r5625 - branches/Branch_Failover_Page/src/main/org/jboss/messaging/core/server/impl.

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

Author: clebert.suconic at jboss.com
Date: 2009-01-13 17:32:24 -0500 (Tue, 13 Jan 2009)
New Revision: 5625

Modified:
   branches/Branch_Failover_Page/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
Log:
Simplification of the replication logic

Modified: branches/Branch_Failover_Page/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java
===================================================================
--- branches/Branch_Failover_Page/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java	2009-01-13 22:28:11 UTC (rev 5624)
+++ branches/Branch_Failover_Page/src/main/org/jboss/messaging/core/server/impl/ServerConsumerImpl.java	2009-01-13 22:32:24 UTC (rev 5625)
@@ -590,32 +590,13 @@
 
    private void sendLargeMessage(final MessageReference ref, final ServerMessage message)
    {
-      DelayedResult result = channel.replicatePacket(new SessionReplicateDeliveryMessage(id,
-                                                                                         message.getMessageID(),
-                                                                                         message.getDestination()));
+      // TODO: Should we block until the replication is done?
+      channel.replicatePacket(new SessionReplicateDeliveryMessage(id, message.getMessageID(), message.getDestination()));
 
+      // SendLargeMessage has to be done on the same thread used on the QueueImpl, or we would have problems.
       largeMessageSender = new LargeMessageSender((LargeServerMessage)message, ref);
+      largeMessageSender.sendLargeMessage();
 
-      if (result == null)
-      {
-         largeMessageSender.sendLargeMessage();
-      }
-      else
-      {
-         
-         final CountDownLatch latchDone = new CountDownLatch(1);
-         // Send when replicate delivery response comes back
-         result.setResultRunner(new Runnable()
-         {
-            public void run()
-            {
-               latchDone.countDown();
-            }
-         });
-
-         largeMessageSender.sendLargeMessage();
-      }
-
    }
 
    /**