diff options
| author | Alan Conway <aconway@apache.org> | 2010-06-09 20:29:32 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2010-06-09 20:29:32 +0000 |
| commit | 1951f9cf0c246b53d1cddf65dfdb059ad8662377 (patch) | |
| tree | 2a8862e880777b61ecaae29bc335f18ade5c18c5 /cpp/src/qpid/sys/ClusterSafe.cpp | |
| parent | 81763331d2256790538f7003e8b98a9fee802881 (diff) | |
| download | qpid-python-1951f9cf0c246b53d1cddf65dfdb059ad8662377.tar.gz | |
Fix cluster-safe assertion in connection negotiation.
See https://bugzilla.redhat.com/show_bug.cgi?id=602347.
In a cluster, raise the management connect event when processing cluster.announce.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@953147 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/sys/ClusterSafe.cpp')
| -rw-r--r-- | cpp/src/qpid/sys/ClusterSafe.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/qpid/sys/ClusterSafe.cpp b/cpp/src/qpid/sys/ClusterSafe.cpp index 498a46d865..e051591afd 100644 --- a/cpp/src/qpid/sys/ClusterSafe.cpp +++ b/cpp/src/qpid/sys/ClusterSafe.cpp @@ -32,8 +32,12 @@ bool inCluster = false; QPID_TSS bool inContext = false; } +bool isClusterSafe() { return !inCluster || inContext; } + +bool isCluster() { return inCluster; } + void assertClusterSafe() { - if (inCluster && !inContext) { + if (!isClusterSafe()) { QPID_LOG(critical, "Modified cluster state outside of cluster context"); ::abort(); } |