diff options
| author | Ted Ross <tross@apache.org> | 2009-12-11 13:52:48 +0000 |
|---|---|---|
| committer | Ted Ross <tross@apache.org> | 2009-12-11 13:52:48 +0000 |
| commit | 3bc7e889caef716d8fdd8006f2d53b821ecef6c1 (patch) | |
| tree | 9ec4173ccd99f4fc3c29fd229fdef322f66ec9ed /qpid/cpp/src/qmf | |
| parent | ea80bee0d468ffab3dfec89ffcd171ad54fdd3c4 (diff) | |
| download | qpid-python-3bc7e889caef716d8fdd8006f2d53b821ecef6c1.tar.gz | |
QPID-2245 QMF protocol changes will make 0.6 incompatible with 0.5
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@889619 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qmf')
| -rw-r--r-- | qpid/cpp/src/qmf/engine/Protocol.cpp | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qmf/engine/SchemaImpl.cpp | 3 | ||||
| -rw-r--r-- | qpid/cpp/src/qmf/engine/ValueImpl.cpp | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/qpid/cpp/src/qmf/engine/Protocol.cpp b/qpid/cpp/src/qmf/engine/Protocol.cpp index 6061b70a8d..9e5f490604 100644 --- a/qpid/cpp/src/qmf/engine/Protocol.cpp +++ b/qpid/cpp/src/qmf/engine/Protocol.cpp @@ -37,14 +37,14 @@ bool Protocol::checkHeader(Buffer& buf, uint8_t *opcode, uint32_t *seq) *opcode = buf.getOctet(); *seq = buf.getLong(); - return h1 == 'A' && h2 == 'M' && h3 == '3'; + return h1 == 'A' && h2 == 'M' && h3 == '2'; } void Protocol::encodeHeader(qpid::framing::Buffer& buf, uint8_t opcode, uint32_t seq) { buf.putOctet('A'); buf.putOctet('M'); - buf.putOctet('3'); + buf.putOctet('2'); buf.putOctet(opcode); buf.putLong (seq); } diff --git a/qpid/cpp/src/qmf/engine/SchemaImpl.cpp b/qpid/cpp/src/qmf/engine/SchemaImpl.cpp index e366a66826..c37ec34890 100644 --- a/qpid/cpp/src/qmf/engine/SchemaImpl.cpp +++ b/qpid/cpp/src/qmf/engine/SchemaImpl.cpp @@ -341,7 +341,6 @@ SchemaObjectClassImpl::SchemaObjectClassImpl(Buffer& buffer) : hasHash(true), cl buffer.getShortString(name); hash.decode(buffer); - /*uint8_t hasParentClass =*/ buffer.getOctet(); // TODO: Parse parent-class indicator uint16_t propCount = buffer.getShort(); uint16_t statCount = buffer.getShort(); uint16_t methodCount = buffer.getShort(); @@ -374,7 +373,7 @@ void SchemaObjectClassImpl::encode(Buffer& buffer) const buffer.putShortString(package); buffer.putShortString(name); hash.encode(buffer); - buffer.putOctet(0); // No parent class + //buffer.putOctet(0); // No parent class buffer.putShort((uint16_t) properties.size()); buffer.putShort((uint16_t) statistics.size()); buffer.putShort((uint16_t) methods.size()); diff --git a/qpid/cpp/src/qmf/engine/ValueImpl.cpp b/qpid/cpp/src/qmf/engine/ValueImpl.cpp index f80bdab866..1949d4b946 100644 --- a/qpid/cpp/src/qmf/engine/ValueImpl.cpp +++ b/qpid/cpp/src/qmf/engine/ValueImpl.cpp @@ -55,8 +55,6 @@ ValueImpl::ValueImpl(Typecode t, Buffer& buf) : typecode(t) case TYPE_MAP: ft.decode(buf); - // TODO: either update to recursively use QMF types or reduce to int/string/... - // (maybe use another ctor with a FieldValue argument) break; case TYPE_LIST: |