svn commit: r713521 - /incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp

[aconway]

Author: aconway
Date: Wed Nov 12 13:49:58 2008
New Revision: 713521

URL: http://svn.apache.org/viewvc?rev=713521&view=rev
Log:
Removed optimisticConsume queue option, queues always consume optimistically.
There's no benefit to non-optimistic consume.

Modified:
    incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp

Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp?rev=713521&r1=713520&r2=713521&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.cpp Wed Nov 12 13:49:58 
2008
@@ -60,7 +60,6 @@
 const std::string qpidTraceIdentity("qpid.trace.id");
 const std::string qpidTraceExclude("qpid.trace.exclude");
 const std::string qpidLastValueQueue("qpid.last_value_queue");
-const std::string qpidOptimisticConsume("qpid.optimistic_consume");
 const std::string qpidPersistLastNode("qpid.persist_last_node");
 const std::string qpidVQMatchProperty("qpid.LVQ_key");
 }
@@ -79,7 +78,6 @@
     exclusive(0),
     noLocal(false),
     lastValueQueue(false),
-    optimisticConsume(false),
     persistLastNode(false),
     inLastNodeFailure(false),
     persistenceId(0),
@@ -277,12 +275,6 @@
                 continue;
             }
 
-            if (!optimisticConsume && store && 
!msg.payload->isEnqueueComplete()) { 
-                QPID_LOG(debug, "Messages not ready to dispatch on queue '" << 
name << "'");
-                addListener(c);
-                return false;
-            }
-            
             if (c->filter(msg.payload)) {
                 if (c->accept(msg.payload)) {            
                     m = msg;
@@ -669,9 +661,6 @@
     lastValueQueue= _settings.get(qpidLastValueQueue);
     if (lastValueQueue) QPID_LOG(debug, "Configured queue as Last Value 
Queue");
 
-    optimisticConsume= _settings.get(qpidOptimisticConsume);
-    if (optimisticConsume) QPID_LOG(debug, "Configured queue with optimistic 
consume");
-    
     persistLastNode= _settings.get(qpidPersistLastNode);
     if (persistLastNode) QPID_LOG(debug, "Configured queue to Persist data if 
cluster fails to one node");