commit ff13c8408b23ebaf9bbb09b1100def0066a4c7cc
author Kenneth Anthony Giusti <kgiusti@apache.org> Fri Jun 17 21:05:29 2011 +0000
committer Kenneth Anthony Giusti <kgiusti@apache.org> Fri Jun 17 21:05:29 2011 +0000
tree 3c7af05d0e98e67bbec6427d82a2359d29ae286f
parent 381b0b422fb2fa82d543eafd0b8051994a171cd8

QPID-3079: remove static locals

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-3079@1137022 13f79535-47bb-0310-9956-ffa450edef68

qpid/cpp/src/qpid/broker/DeliveryRecord.cpp

diff --git a/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
index d0a450c..1f2b259 100644
--- a/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
+++ b/qpid/cpp/src/qpid/broker/DeliveryRecord.cpp
@@ -113,14 +113,13 @@
 /** Accept msg, and optionally notify caller when dequeue completes */
 boost::intrusive_ptr<Queue::DequeueCompletion>
 DeliveryRecord::accept(TransactionContext* ctxt) {
-    static const boost::intrusive_ptr<Queue::DequeueCompletion> empty;
+    boost::intrusive_ptr<Queue::DequeueCompletion> dq;
     if (acquired && !ended) {
         QPID_LOG(debug, "Accepted " << id);
-        boost::intrusive_ptr<Queue::DequeueCompletion> dq(queue->dequeue(ctxt, msg));
+        dq = queue->dequeue(ctxt, msg);
         setEnded();
-        return dq;
     }
-    return empty;
+    return dq;
 }
 
 void DeliveryRecord::dequeue(TransactionContext* ctxt) const{

qpid/cpp/src/qpid/broker/Queue.cpp

diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 0520099..04d61c1 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -659,7 +659,7 @@
 boost::intrusive_ptr<Queue::DequeueCompletion>
 Queue::dequeue(TransactionContext* ctxt, const QueuedMessage& msg)
 {
-    static const boost::intrusive_ptr<DequeueCompletion> empty;
+    boost::intrusive_ptr<DequeueCompletion> empty;
     ScopedUse u(barrier);
     if (!u.acquired) return empty;