summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/cluster/ErrorCheck.h
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-07-01 13:47:04 +0000
committerAlan Conway <aconway@apache.org>2009-07-01 13:47:04 +0000
commit6f734e4aa938dccdc1c79e782908a0d1164ee526 (patch)
tree3177af16cacd4ea4d265f7c0c48c181c85512608 /cpp/src/qpid/cluster/ErrorCheck.h
parentcc0cb6411e14e23d45304c3ae84069d59b29465a (diff)
downloadqpid-python-6f734e4aa938dccdc1c79e782908a0d1164ee526.tar.gz
Fix members joining cluster while cluster is handling client errors.
Previously cluster members could abort if a new member joins while existing members are handling a client error. Now if an update offer arrives while an error is in progress, the offering broker retracts the offer and the newcomer must try again. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@790163 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster/ErrorCheck.h')
-rw-r--r--cpp/src/qpid/cluster/ErrorCheck.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/qpid/cluster/ErrorCheck.h b/cpp/src/qpid/cluster/ErrorCheck.h
index 97b5f2bffd..d303ecea65 100644
--- a/cpp/src/qpid/cluster/ErrorCheck.h
+++ b/cpp/src/qpid/cluster/ErrorCheck.h
@@ -53,7 +53,8 @@ class ErrorCheck
ErrorCheck(Cluster&);
/** A local error has occured */
- void error(Connection&, ErrorType, uint64_t frameSeq, const MemberSet&);
+ void error(Connection&, ErrorType, uint64_t frameSeq, const MemberSet&,
+ const std::string& msg);
/** Called when a frame is delivered */
void delivered(const EventFrame&);