diff options
| author | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-10-03 13:36:37 +0000 |
|---|---|---|
| committer | Kenneth Anthony Giusti <kgiusti@apache.org> | 2012-10-03 13:36:37 +0000 |
| commit | 378aa46b6ac8288e23a32672d47072457ee830dd (patch) | |
| tree | 7eb4c198e4fc6ad6ad285fd5db8b4e0083f7eb51 /cpp/src/qpid/broker/Broker.cpp | |
| parent | e091121f8c4a153070fbb6bd5fc92136f3ebf55f (diff) | |
| download | qpid-python-378aa46b6ac8288e23a32672d47072457ee830dd.tar.gz | |
QPID-4347: do not store Links/Bridges if they are created via recovery.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1393479 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Broker.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Broker.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index d45dbc61d2..5b59decd69 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -214,6 +214,7 @@ Broker::Broker(const Broker::Options& conf) : *this), mgmtObject(0), queueCleaner(queues, &timer), + recoveryInProgress(false), recovery(true), inCluster(false), clusterUpdatee(false), @@ -292,7 +293,9 @@ Broker::Broker(const Broker::Options& conf) : // broker to join a cluster. if (getRecovery()) { RecoveryManagerImpl recoverer(queues, exchanges, links, dtxManager); + recoveryInProgress = true; store->recover(recoverer); + recoveryInProgress = false; } else { QPID_LOG(notice, "Cluster recovery: recovered journal data discarded and journal files pushed down"); |