You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2011/06/17 21:08:11 UTC
svn commit: r1136982 - in /qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker:
PersistableQueue.h Queue.cpp Queue.h RecoverableQueue.h
RecoveryManagerImpl.cpp
Author: kgiusti
Date: Fri Jun 17 19:08:11 2011
New Revision: 1136982
URL: http://svn.apache.org/viewvc?rev=1136982&view=rev
Log:
QPID-3079: revert external store back to raw pointer.
Modified:
qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableQueue.h
qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp
qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.h
qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoverableQueue.h
qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableQueue.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableQueue.h?rev=1136982&r1=1136981&r2=1136982&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableQueue.h (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/PersistableQueue.h Fri Jun 17 19:08:11 2011
@@ -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;
};
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp?rev=1136982&r1=1136981&r2=1136982&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.cpp Fri Jun 17 19:08:11 2011
@@ -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) {
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.h?rev=1136982&r1=1136981&r2=1136982&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/Queue.h Fri Jun 17 19:08:11 2011
@@ -376,7 +376,7 @@ class Queue : public boost::enable_share
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;
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoverableQueue.h
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoverableQueue.h?rev=1136982&r1=1136981&r2=1136982&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoverableQueue.h (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoverableQueue.h Fri Jun 17 19:08:11 2011
@@ -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;
};
Modified: qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp?rev=1136982&r1=1136981&r2=1136982&view=diff
==============================================================================
--- qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp (original)
+++ qpid/branches/qpid-3079/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp Fri Jun 17 19:08:11 2011
@@ -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:
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();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org