Use octet each for class and method id (changed c++ and python)

Modified indexes in xml for message.empty, message.offset and the c++ cluster class

Fixed encoding for rfc1982-long-set in c++ and python (its a size not a count that is prepended)

Fixed minor typo in configuration option help string

Use session.open/close in python tests, handle session.closed

Commented out the response tag in session.close due to pythons ambiguity as to whether session.closed is a response or not

Disabled broker.test_closed_channel (due to above issue); broker behaves as expected but test fails; test_invalid_channel is safe enough for now.
  


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@578053 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/qpid/framing/MethodHolder.cpp b/cpp/src/qpid/framing/MethodHolder.cpp
index 691d556ade..78dd2bdcaf 100644
--- a/cpp/src/qpid/framing/MethodHolder.cpp
+++ b/cpp/src/qpid/framing/MethodHolder.cpp
@@ -41,14 +41,14 @@ const AMQMethodBody* MethodHolder::get() const {
 
 void MethodHolder::encode(Buffer& b) const {
     const AMQMethodBody* body = get();
-    b.putShort(body->amqpClassId());
-    b.putShort(body->amqpMethodId());
+    b.putOctet(body->amqpClassId());
+    b.putOctet(body->amqpMethodId());
     body->encode(b);
 }
 
 void MethodHolder::decode(Buffer& b) {
-    ClassId c=b.getShort();
-    MethodId m=b.getShort();
+    ClassId c=b.getOctet();
+    MethodId m=b.getOctet();
     construct(c,m);
     get()->decode(b);
 }