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/qpid@786294 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 14 insertions, 13 deletions

diff --git a/cpp/xml/cluster.xml b/cpp/xml/cluster.xml
index 7ca3dc862f..8b1d47e56e 100644
--- a/cpp/xml/cluster.xml
+++ b/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.