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 | 47c1815b31ceb6fd3fca252acd87d12c5ec20c61 (patch) | |
| tree | f4fb871370d67d8d632aeae54fadb94caed26e48 /cpp/src | |
| parent | 00c41fa9b4dbe87c1c22e8f43f1990a10ee866c5 (diff) | |
| download | qpid-python-47c1815b31ceb6fd3fca252acd87d12c5ec20c61.tar.gz | |
Joining a cluster: don't push an empty store.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@929278 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp index 258460fe8f..858900be9e 100644 --- a/cpp/src/qpid/cluster/Cluster.cpp +++ b/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; |