From 641f048cb8b86be0304441a6227759d7ad420ff3 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Thu, 11 Jun 2009 15:54:37 +0000 Subject: QPID-1786 - Committed qmf patches from Bryan Kearney Additionally updated existing qmf and Qman to be compatible. The magic number for qmf messages has been incremented. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@783818 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/management/Protocol.java | 2 +- .../domain/handler/impl/SchemaResponseMessageHandler.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'qpid/java/management/client/src') diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/Protocol.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/Protocol.java index c1b1ceb5b4..48ef10f60a 100644 --- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/Protocol.java +++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/Protocol.java @@ -27,7 +27,7 @@ package org.apache.qpid.management; */ public interface Protocol { - String MAGIC_NUMBER = "AM2"; + String MAGIC_NUMBER = "AM3"; char SCHEMA_REQUEST_OPCODE = 'S'; char SCHEMA_RESPONSE_OPCODE = Character.toLowerCase(SCHEMA_REQUEST_OPCODE); diff --git a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java index ee5efe2af6..e05bcee820 100644 --- a/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java +++ b/qpid/java/management/client/src/main/java/org/apache/qpid/management/domain/handler/impl/SchemaResponseMessageHandler.java @@ -68,11 +68,18 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler String className = decoder.readStr8(); Binary schemaHash = new Binary(decoder.readBin128()); - + + int hasSuperclass = decoder.readUint8(); int howManyProperties = decoder.readUint16(); int howManyStatistics = decoder.readUint16(); int howManyMethods = decoder.readUint16(); + if (hasSuperclass != 0) { + String parentPackageName = decoder.readStr8(); + String parentClassName = decoder.readStr8(); + Binary parentHash = new Binary(decoder.readBin128()); + } + _domainModel.addSchema( packageName, className, @@ -214,4 +221,4 @@ public class SchemaResponseMessageHandler extends BaseMessageHandler } return result; } - } \ No newline at end of file + } -- cgit v1.2.1