svn commit: r633461 - /incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java

[rg...@apache.org]

Author: rgodfrey
Date: Tue Mar  4 05:01:54 2008
New Revision: 633461

URL: http://svn.apache.org/viewvc?rev=633461&view=rev
Log:
QPID-831 : Remove incorrect references to getDeliveredToConsumer()

Modified:
    incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java

Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java?rev=633461&r1=633460&r2=633461&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/queue/ConcurrentSelectorDeliveryManager.java Tue Mar  4 05:01:54 2008
@@ -313,13 +313,11 @@
         {
             QueueEntry entry = currentQueue.next();
 
-            if (!entry.getDeliveredToConsumer())
+            if (subscription.hasInterest(entry))
             {
-                if (subscription.hasInterest(entry))
-                {
-                    subscription.enqueueForPreDelivery(entry, false);
-                }
+                subscription.enqueueForPreDelivery(entry, false);
             }
+
         }
     }
 
@@ -509,9 +507,6 @@
         while (purgeMessage(entry, sub, purgeOnly))
         {
             AMQMessage message = entry.getMessage();
-            // if we are purging then ensure we mark this message taken for the current subscriber
-            // the current subscriber may be null in the case of a get or a purge but this is ok.
-//            boolean alreadyTaken = message.taken(_queue, sub);
 
             //remove the already taken message or expired
             QueueEntry removed = messages.poll();
@@ -519,7 +514,7 @@
             assert removed == entry;
 
             // if the message expired then the _totalMessageSize needs adjusting
-            if (message.expired(_queue) && !entry.getDeliveredToConsumer())
+            if (message.expired(_queue) && !entry.taken(sub))
             {
                 _totalMessageSize.addAndGet(-entry.getSize());
 
@@ -866,17 +861,6 @@
                     }
                     for (Subscription sub : _subscriptions.getSubscriptions())
                     {
-
-                        // stop if the message gets delivered whilst PreDelivering if we have a shared queue.
-                        if (_queue.isShared() && entry.getDeliveredToConsumer())
-                        {
-                            if (debugEnabled)
-                            {
-                                _log.debug(debugIdentity() + "Stopping PreDelivery as message(" + System.identityHashCode(entry) +
-                                           ") is already delivered.");
-                            }
-                            continue;
-                        }
 
                         // Only give the message to those that want them.
                         if (sub.hasInterest(entry))