diff options
| author | Alan Conway <aconway@apache.org> | 2010-03-30 20:57:37 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-03-30 20:57:37 +0000 |
| commit | c2862944f94bdae8d467980da5946e8e7b6fa2e1 (patch) | |
| tree | 646b727f5ce615fa59a5b1b11e53149a61a44dd8 | |
| parent | 090e9f4a0f7378dc7f6192a839687948db44ea26 (diff) | |
| download | qpid-python-c2862944f94bdae8d467980da5946e8e7b6fa2e1.tar.gz | |
Joining a cluster: don't push an empty store.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@929278 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/qpid/cluster/Cluster.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qpid/cpp/src/qpid/cluster/Cluster.cpp b/qpid/cpp/src/qpid/cluster/Cluster.cpp index 258460fe8f..858900be9e 100644 --- a/qpid/cpp/src/qpid/cluster/Cluster.cpp +++ b/qpid/cpp/src/qpid/cluster/Cluster.cpp @@ -599,6 +599,7 @@ void Cluster::initMapCompleted(Lock& l) { // We decide here whether we want to recover from our store. // We won't recover if we are joining an active cluster or our store is dirty. if (store.hasStore() && + store.getState() != STORE_STATE_EMPTY_STORE && (initMap.isActive() || store.getState() == STORE_STATE_DIRTY_STORE)) broker.setRecovery(false); // Ditch my current store. state = INIT; |