QPID-3079: update stores to use new api

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

4 files changed, 9 insertions, 9 deletions

diff --git a/qpid/cpp/src/qpid/store/MessageStorePlugin.h b/qpid/cpp/src/qpid/store/MessageStorePlugin.h
index 4a9bb2aecb..dcf704b9d1 100644
--- a/qpid/cpp/src/qpid/store/MessageStorePlugin.h
+++ b/qpid/cpp/src/qpid/store/MessageStorePlugin.h
@@ -215,7 +215,7 @@ class MessageStorePlugin :
      */
     virtual void dequeue(broker::TransactionContext* ctxt,
                          const boost::intrusive_ptr<broker::PersistableMessage>& msg,
-                         const broker::PersistableQueue& queue);
+                         const boost::shared_ptr<broker::PersistableQueue>& queue);
 
     /**
      * Flushes all async messages to disk for the specified queue
diff --git a/qpid/cpp/src/qpid/store/StorageProvider.h b/qpid/cpp/src/qpid/store/StorageProvider.h
index bc8d187517..cef077c160 100644
--- a/qpid/cpp/src/qpid/store/StorageProvider.h
+++ b/qpid/cpp/src/qpid/store/StorageProvider.h
@@ -277,7 +277,7 @@ public:
      */
     virtual void dequeue(qpid::broker::TransactionContext* ctxt,
                          const boost::intrusive_ptr<PersistableMessage>& msg,
-                         const PersistableQueue& queue) = 0;
+                         const boost::shared_ptr<PersistableQueue>& queue) = 0;
 
     /**
      * Flushes all async messages to disk for the specified queue
diff --git a/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp b/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
index 586aaaf980..66cb65e03a 100644
--- a/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
+++ b/qpid/cpp/src/qpid/store/ms-clfs/MSSqlClfsProvider.cpp
@@ -827,7 +827,7 @@ MSSqlClfsProvider::enqueue(qpid::broker::TransactionContext* ctxt,
 void
 MSSqlClfsProvider::dequeue(qpid::broker::TransactionContext* ctxt,
                            const boost::intrusive_ptr<PersistableMessage>& msg,
-                           const PersistableQueue& queue)
+                           const boost::shared_ptr<PersistableQueue>& queue)
 {
     Transaction::shared_ptr t;
     TransactionContext *ctx = dynamic_cast<TransactionContext*>(ctxt);
@@ -839,8 +839,8 @@ MSSqlClfsProvider::dequeue(qpid::broker::TransactionContext* ctxt,
         if (tctx)
             t = tctx->getTransaction();
     }
-    messages.dequeue(msg->getPersistenceId(), queue.getPersistenceId(), t);
-    msg->dequeueComplete();
+    messages.dequeue(msg->getPersistenceId(), queue->getPersistenceId(), t);
+    queue->dequeueComplete(msg);
 }
 
 std::auto_ptr<qpid::broker::TransactionContext>
diff --git a/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp b/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
index 7f22db3d02..bf7eb4f112 100644
--- a/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
+++ b/qpid/cpp/src/qpid/store/ms-sql/MSSqlProvider.cpp
@@ -784,7 +784,7 @@ MSSqlProvider::enqueue(qpid::broker::TransactionContext* ctxt,
 void
 MSSqlProvider::dequeue(qpid::broker::TransactionContext* ctxt,
                        const boost::intrusive_ptr<PersistableMessage>& msg,
-                       const PersistableQueue& queue)
+                       const boost::shared_ptr<PersistableQueue>& queue)
 {
     // If this dequeue is in the context of a transaction, use the specified
     // transaction to nest a new transaction for this operation. However, if
@@ -821,12 +821,12 @@ MSSqlProvider::dequeue(qpid::broker::TransactionContext* ctxt,
         // transaction doesn't commit.
         if (!xid.empty()) {
             rsMap.pendingRemove(msg->getPersistenceId(),
-                                queue.getPersistenceId(),
+                                queue->getPersistenceId(),
                                 xid);
         }
         else {
             rsMap.remove(msg->getPersistenceId(),
-                         queue.getPersistenceId());
+                         queue->getPersistenceId());
         }
         if (atxn)
             atxn->sqlCommit();
@@ -848,7 +848,7 @@ MSSqlProvider::dequeue(qpid::broker::TransactionContext* ctxt,
             db->rollbackTransaction();
         throw ADOException("Error dequeuing message", e, errs);
     }  
-    msg->dequeueComplete();
+    queue->dequeueComplete(msg);
 }
 
 std::auto_ptr<qpid::broker::TransactionContext>