Author: aconway
Date: Fri Sep 30 20:55:48 2011
New Revision: 1177830
URL: http://svn.apache.org/viewvc?rev=1177830&view=rev
Log:
QPID-2920: Remove unused QueueHandler member from BrokerContext.
Modified:
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.h
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/Core.cpp
Modified:
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp?rev=1177830&r1=1177829&r2=1177830&view=diff
==============================================================================
---
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp
(original)
+++
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.cpp
Fri Sep 30 20:55:48 2011
@@ -22,7 +22,6 @@
#include "Core.h"
#include "BrokerContext.h"
#include "QueueContext.h"
-#include "QueueHandler.h"
#include "Multicaster.h"
#include "hash.h"
#include "qpid/framing/ClusterMessageEnqueueBody.h"
@@ -81,8 +80,7 @@ BrokerContext::ScopedSuppressReplication
tssReplicate = true;
}
-BrokerContext::BrokerContext(Core& c, boost::intrusive_ptr<QueueHandler> q)
- : core(c), queueHandler(q) {}
+BrokerContext::BrokerContext(Core& c) : core(c) {}
BrokerContext::~BrokerContext() {}
@@ -104,8 +102,10 @@ void BrokerContext::routing(const boost:
void BrokerContext::routed(const boost::intrusive_ptr<Message>&) {}
void BrokerContext::acquire(const broker::QueuedMessage& qm) {
- if (tssReplicate)
+ if (tssReplicate) {
+ assert(!qm.queue->isConsumingStopped());
mcaster(qm).mcast(ClusterMessageAcquireBody(pv, qm.queue->getName(),
qm.position));
+ }
}
void BrokerContext::dequeue(const broker::QueuedMessage& qm) {
Modified:
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.h
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.h?rev=1177830&r1=1177829&r2=1177830&view=diff
==============================================================================
---
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.h
(original)
+++
qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/BrokerContext.h
Fri Sep 30 20:55:48 2011
@@ -28,7 +28,6 @@
namespace qpid {
namespace cluster {
class Core;
-class QueueHandler;
class QueueContext;
// TODO aconway 2010-10-19: experimental cluster code.
@@ -47,7 +46,7 @@ class BrokerContext : public broker::Clu
~ScopedSuppressReplication();
};
- BrokerContext(Core&, boost::intrusive_ptr<QueueHandler>);
+ BrokerContext(Core&);
~BrokerContext();
// Messages
@@ -86,7 +85,6 @@ class BrokerContext : public broker::Clu
Multicaster& mcaster(const std::string&);
Core& core;
- boost::intrusive_ptr<QueueHandler> queueHandler;
};
}} // namespace qpid::cluster
Modified: qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/Core.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/Core.cpp?rev=1177830&r1=1177829&r2=1177830&view=diff
==============================================================================
--- qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/Core.cpp
(original)
+++ qpid/branches/qpid-2920-active/qpid/cpp/src/qpid/cluster/exp/Core.cpp Fri
Sep 30 20:55:48 2011
@@ -56,7 +56,7 @@ Core::Core(const Settings& s, broker::Br
groups[i]->getEventHandler().add(boost::intrusive_ptr<HandlerBase>(
new
MessageHandler(groups[i]->getEventHandler(), *this)));
- std::auto_ptr<BrokerContext> bh(new BrokerContext(*this,
queueHandler));
+ std::auto_ptr<BrokerContext> bh(new BrokerContext(*this));
brokerHandler = bh.get();
// BrokerContext belongs to Broker
broker.setCluster(std::auto_ptr<broker::Cluster>(bh));
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
