diff options
| author | Alan Conway <aconway@apache.org> | 2013-08-01 20:27:05 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2013-08-01 20:27:05 +0000 |
| commit | dcbe820e4ebdbd4919ebd07b56790e15de3013e9 (patch) | |
| tree | 946cbe4b39c6313499b2841cb461025edc3ed5f8 /qpid/cpp/src/qpid/ha/Primary.cpp | |
| parent | f2ed9f5fc74bb266fa883409cc50b7e181742594 (diff) | |
| download | qpid-python-dcbe820e4ebdbd4919ebd07b56790e15de3013e9.tar.gz | |
QPID-4327: HA get rid of Primary::get() singleton.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1509422 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpid/ha/Primary.cpp')
| -rw-r--r-- | qpid/cpp/src/qpid/ha/Primary.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp index 38e75e7818..bae651a3fc 100644 --- a/qpid/cpp/src/qpid/ha/Primary.cpp +++ b/qpid/cpp/src/qpid/ha/Primary.cpp @@ -82,8 +82,6 @@ class ExpectedBackupTimerTask : public sys::TimerTask { } // namespace -Primary* Primary::instance = 0; - Primary::Primary(HaBroker& hb, const BrokerInfo::Set& expect) : haBroker(hb), membership(hb.getMembership()), logPrefix("Primary: "), active(false), @@ -92,8 +90,6 @@ Primary::Primary(HaBroker& hb, const BrokerInfo::Set& expect) : hb.getMembership().setStatus(RECOVERING); broker::QueueRegistry& queues = hb.getBroker().getQueues(); queues.eachQueue(boost::bind(&Primary::initializeQueue, this, _1)); - assert(instance == 0); - instance = this; // Let queue replicators find us. if (expect.empty()) { QPID_LOG(notice, logPrefix << "Promoted to primary. No expected backups."); } |