QPID-3079: revert external store back to raw pointer.

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

5 files changed, 13 insertions, 13 deletions

diff --git a/qpid/cpp/src/qpid/broker/PersistableQueue.h b/qpid/cpp/src/qpid/broker/PersistableQueue.h
index 7b0c313f50..0f81b97b68 100644
--- a/qpid/cpp/src/qpid/broker/PersistableQueue.h
+++ b/qpid/cpp/src/qpid/broker/PersistableQueue.h
@@ -58,18 +58,19 @@ public:
     virtual const std::string& getName() const = 0;
     virtual ~PersistableQueue() {};
 
-    virtual void setExternalQueueStore(const boost::shared_ptr<ExternalQueueStore>& inst) = 0;
+    virtual void setExternalQueueStore(ExternalQueueStore* inst) = 0;
     virtual void flush() = 0;
     
-    inline boost::shared_ptr<ExternalQueueStore> getExternalQueueStore() const {return externalQueueStore;};
+    inline ExternalQueueStore* getExternalQueueStore() const {return externalQueueStore;};
     
-    PersistableQueue() {};
+    PersistableQueue():externalQueueStore(NULL) {
+    };
 
     /** the message has finished being dequeued from the store */
     virtual void dequeueComplete(const boost::intrusive_ptr<PersistableMessage>&) = 0;
     
 protected:
-    boost::shared_ptr<ExternalQueueStore> externalQueueStore;
+    ExternalQueueStore *externalQueueStore;
     
 };
 
diff --git a/qpid/cpp/src/qpid/broker/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index 830589e687..c3e9f4ea3a 100644
--- a/qpid/cpp/src/qpid/broker/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -1040,8 +1040,7 @@ bool Queue::hasExclusiveConsumer() const
     return exclusive; 
 }
 
-void Queue::setExternalQueueStore(const boost::shared_ptr<ExternalQueueStore>& inst)
-{
+void Queue::setExternalQueueStore(ExternalQueueStore* inst) {
     externalQueueStore = inst;
 
     if (inst) {
diff --git a/qpid/cpp/src/qpid/broker/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index 69c07b1b78..0215870f90 100644
--- a/qpid/cpp/src/qpid/broker/Queue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
@@ -376,7 +376,7 @@ class Queue : public boost::enable_shared_from_this<Queue>,
     static Queue::shared_ptr restore(QueueRegistry& queues, framing::Buffer& buffer);
     static void tryAutoDelete(Broker& broker, Queue::shared_ptr);
 
-    virtual void setExternalQueueStore(const boost::shared_ptr<ExternalQueueStore>& inst);
+    virtual void setExternalQueueStore(ExternalQueueStore* inst);
 
     // Manageable entry points
     management::ManagementObject* GetManagementObject (void) const;
diff --git a/qpid/cpp/src/qpid/broker/RecoverableQueue.h b/qpid/cpp/src/qpid/broker/RecoverableQueue.h
index 82f066a318..49f05f97a1 100644
--- a/qpid/cpp/src/qpid/broker/RecoverableQueue.h
+++ b/qpid/cpp/src/qpid/broker/RecoverableQueue.h
@@ -48,8 +48,8 @@ public:
     virtual ~RecoverableQueue() {};
 
     virtual const std::string& getName() const = 0;
-    virtual void setExternalQueueStore(const boost::shared_ptr<ExternalQueueStore>& inst) = 0;
-	virtual boost::shared_ptr<ExternalQueueStore> getExternalQueueStore() const = 0;
+    virtual void setExternalQueueStore(ExternalQueueStore* inst) = 0;
+	virtual ExternalQueueStore* getExternalQueueStore() const = 0;
 
 };
 
diff --git a/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
index 69813e6bc4..d08409695e 100644
--- a/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
+++ b/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
@@ -65,8 +65,8 @@ public:
     void setPersistenceId(uint64_t id);    
 	uint64_t getPersistenceId() const;
     const std::string& getName() const;
-    void setExternalQueueStore(const boost::shared_ptr<ExternalQueueStore>& inst);
-    boost::shared_ptr<ExternalQueueStore> getExternalQueueStore() const;
+    void setExternalQueueStore(ExternalQueueStore* inst);
+    ExternalQueueStore* getExternalQueueStore() const;
     void recover(RecoverableMessage::shared_ptr msg);
     void enqueue(DtxBuffer::shared_ptr buffer, RecoverableMessage::shared_ptr msg);
     void dequeue(DtxBuffer::shared_ptr buffer, RecoverableMessage::shared_ptr msg);
@@ -213,12 +213,12 @@ const std::string& RecoverableQueueImpl::getName() const
     return queue->getName();
 }
     
-void RecoverableQueueImpl::setExternalQueueStore(const boost::shared_ptr<ExternalQueueStore>& inst)
+void RecoverableQueueImpl::setExternalQueueStore(ExternalQueueStore* inst)
 {
     queue->setExternalQueueStore(inst);
 }
 
-boost::shared_ptr<ExternalQueueStore> RecoverableQueueImpl::getExternalQueueStore() const
+ExternalQueueStore* RecoverableQueueImpl::getExternalQueueStore() const
 {
 	return queue->getExternalQueueStore();
 }