Attachment 647949 Details for Bug 876720 – Updated: Quick patch to prevent this crash

[patch] Updated: Quick patch to prevent this crash

bz876720.patch (text/plain), 3.08 KB, created by Jason Dillaman on 2012-11-19 18:57:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Dillaman

Created: 2012-11-19 18:57:10 UTC

Size: 3.08 KB

patch

obsolete

>diff --git a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
>index e70c81e..94d75e6 100644
>--- a/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
>+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.cpp
>@@ -201,17 +201,17 @@ class BrokerReplicator::ErrorListener : public SessionHandler::ErrorListener {
> class BrokerReplicator::ConnectionObserver : public broker::ConnectionObserver
> {
>   public:
>-    ConnectionObserver(BrokerReplicator& br) : brokerReplicator(br) {}
>+    ConnectionObserver(boost::shared_ptr<BrokerReplicator> br) : brokerReplicator(br) {}
>     virtual void connection(Connection&) {}
>     virtual void opened(Connection&) {}
> 
>     virtual void closed(Connection& c) {
>-        if (brokerReplicator.link && &c == brokerReplicator.connection)
>-            brokerReplicator.disconnected();
>+        if (brokerReplicator->link && &c == brokerReplicator->connection)
>+            brokerReplicator->disconnected();
>     }
>     virtual void forced(Connection& c, const std::string& /*message*/) { closed(c); }
>   private:
>-    BrokerReplicator& brokerReplicator;
>+    boost::shared_ptr<BrokerReplicator> brokerReplicator;
> };
> 
> /** Keep track of queues or exchanges during the update process to solve 2
>@@ -281,8 +281,6 @@ BrokerReplicator::BrokerReplicator(HaBroker& hb, const boost::shared_ptr<Link>&
>       alternates(hb.getBroker().getExchanges()),
>       connection(0)
> {
>-    broker.getConnectionObservers().add(
>-        boost::shared_ptr<broker::ConnectionObserver>(new ConnectionObserver(*this)));
>     framing::FieldTable args = getArgs();
>     args.setString(QPID_REPLICATE, printable(NONE).str());
>     setArgs(args);
>@@ -299,6 +297,9 @@ BrokerReplicator::BrokerReplicator(HaBroker& hb, const boost::shared_ptr<Link>&
> 
> void BrokerReplicator::initialize() {
>     // Can't do this in the constructor because we need a shared_ptr to this.
>+    connectionObserver.reset(new ConnectionObserver(shared_from_this()));
>+    broker.getConnectionObservers().add(connectionObserver);
>+
>     types::Uuid uuid(true);
>     const std::string name(QPID_CONFIGURATION_REPLICATOR + ".bridge." + uuid.str());
>     std::pair<Bridge::shared_ptr, bool> result = broker.getLinks().declare(
>@@ -333,7 +334,10 @@ void collectQueueReplicators(
> }
> } // namespace
> 
>-void BrokerReplicator::shutdown() {}
>+void BrokerReplicator::shutdown() {
>+    broker.getConnectionObservers().remove(connectionObserver);
>+    connectionObserver.reset();
>+}
> 
> // This is called in the connection IO thread when the bridge is started.
> void BrokerReplicator::initializeBridge(Bridge& bridge, SessionHandler& sessionHandler) {
>diff --git a/qpid/cpp/src/qpid/ha/BrokerReplicator.h b/qpid/cpp/src/qpid/ha/BrokerReplicator.h
>index 7136f32..723c4fe 100644
>--- a/qpid/cpp/src/qpid/ha/BrokerReplicator.h
>+++ b/qpid/cpp/src/qpid/ha/BrokerReplicator.h
>@@ -149,6 +149,7 @@ class BrokerReplicator : public broker::Exchange,
>     EventDispatchMap dispatch;
>     std::auto_ptr<UpdateTracker> queueTracker;
>     std::auto_ptr<UpdateTracker> exchangeTracker;
>+    boost::shared_ptr<ConnectionObserver> connectionObserver;
> };
> }} // namespace qpid::broker
>

Actions: View | Diff

Attachments on bug 876720: 647948 | 647949