diff options
| author | Alan Conway <aconway@apache.org> | 2009-06-18 21:25:00 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2009-06-18 21:25:00 +0000 |
| commit | 1ab0573accff3416b1a22ac69eacb57c63bb69f0 (patch) | |
| tree | 5c6146f277426c6e42a1e1d19528cf16da5cab0a /qpid/cpp/xml | |
| parent | 0ac0ba5e1d146a133abbd1ea0ddcabe6d25ab987 (diff) | |
| download | qpid-python-1ab0573accff3416b1a22ac69eacb57c63bb69f0.tar.gz | |
Make error-check a cluster-connection control rather than a cluster control.
Fixes bug if an error occurs during update. As cluster controls, error-checks
were being processed out of sequence with the connection data they referred to.
Making them connection controls ensures they are processed in the proper order.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@786294 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/xml')
| -rw-r--r-- | qpid/cpp/xml/cluster.xml | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/qpid/cpp/xml/cluster.xml b/qpid/cpp/xml/cluster.xml index 7ca3dc862f..8b1d47e56e 100644 --- a/qpid/cpp/xml/cluster.xml +++ b/qpid/cpp/xml/cluster.xml @@ -48,19 +48,6 @@ <field name="id" type="uint64"/> </control> - <domain name="error-type" type="uint8" label="Types of error"> - <enum> - <choice name="none" value="0"/> - <choice name="session" value="1"/> - <choice name="connection" value="2"/> - </enum> - </domain> - - <control name="error-check" code="0x13"> - <field name="type" type="error-type"/> - <field name="frame-seq" type="uint64"/> - </control> - <control name="shutdown" code="0x20" label="Shut down entire cluster"/> </class> @@ -80,6 +67,20 @@ <field name="limit" type="uint32"/> </control> + <domain name="error-type" type="uint8" label="Types of error"> + <enum> + <choice name="none" value="0"/> + <choice name="session" value="1"/> + <choice name="connection" value="2"/> + </enum> + </domain> + + <!-- Check for error consistency across the cluster --> + <control name="error-check" code="0x4"> + <field name="type" type="error-type"/> + <field name="frame-seq" type="uint64"/> + </control> + <!-- Update controls. Sent to a new broker in joining mode. A connection is updateed as followed: - open as a normal connection. |