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 | 0ffcd71ac9c9f3742aae6e251eafe031068bda31 (patch) | |
| tree | 819256b98024e2f024db67a1d19aa4cb6c250050 /cpp/src/qpid/ha/Primary.cpp | |
| parent | a9df65f54828ecf4322e9c09571906001a6ba185 (diff) | |
| download | qpid-python-0ffcd71ac9c9f3742aae6e251eafe031068bda31.tar.gz | |
QPID-4327: HA get rid of Primary::get() singleton.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1509422 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/ha/Primary.cpp')
| -rw-r--r-- | cpp/src/qpid/ha/Primary.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cpp/src/qpid/ha/Primary.cpp b/cpp/src/qpid/ha/Primary.cpp index 38e75e7818..bae651a3fc 100644 --- a/cpp/src/qpid/ha/Primary.cpp +++ b/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."); } |