QPID-2245 QMF protocol changes will make 0.6 incompatible with 0.5

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

3 files changed, 8 insertions, 36 deletions

diff --git a/java/management/console/src/main/java/org/apache/qpid/console/Broker.java b/java/management/console/src/main/java/org/apache/qpid/console/Broker.java
index 8c71925f4e..2ea2ab8a70 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/Broker.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/Broker.java
@@ -111,7 +111,7 @@ public class Broker implements MessageListener
                 return returnValue;
             }
             character = (char) decoder.readUint8();
-            if (character != '3')
+            if (character != '2')
             {
                 return returnValue;
             }
@@ -349,7 +349,7 @@ public class Broker implements MessageListener
     {
         enc.writeUint8((short) 'A');
         enc.writeUint8((short) 'M');
-        enc.writeUint8((short) '3');
+        enc.writeUint8((short) '2');
         enc.writeUint8((short) opcode);
         enc.writeUint32(sequence);
         return enc;
@@ -502,4 +502,4 @@ public class Broker implements MessageListener
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java b/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java
index 783a4b4b86..a0faa6c73d 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/SchemaClass.java
@@ -43,7 +43,7 @@ public class SchemaClass
         setKind(kind);

         setSession(session);

         this.setKey(key);

-        boolean hasSupertype = dec.readUint8() != 0;

+        boolean hasSupertype = false; //dec.readUint8() != 0;

         if (kind == CLASS_KIND_TABLE)

         {

             int propCount = dec.readUint16();

@@ -248,4 +248,4 @@ public class SchemaClass
     {

         this.classKey = classKey;

     }

-}
\ No newline at end of file
+}

diff --git a/java/management/console/src/main/java/org/apache/qpid/console/Session.java b/java/management/console/src/main/java/org/apache/qpid/console/Session.java
index cb2e39c15f..822f215f4d 100644
--- a/java/management/console/src/main/java/org/apache/qpid/console/Session.java
+++ b/java/management/console/src/main/java/org/apache/qpid/console/Session.java
@@ -189,22 +189,7 @@ public class Session
         case 14: // UUID

             return dec.readUuid();

         case 15: // Ftable

-            java.util.HashMap<String, Object> ftable = new java.util.HashMap<String, Object>();

-            BBDecoder sc = new BBDecoder();

-            sc.init(ByteBuffer.wrap(dec.readVbin32()));

-            if (sc.hasRemaining())

-            {

-                long count = sc.readUint32();

-                while (count > 0)

-                {

-                    String key = sc.readStr8();

-                    short code = sc.readUint8();

-                    Object newValue = this.decodeValue(sc, code);

-                    ftable.put(key, newValue);

-                    count -= 1;

-                }

-            }

-            return ftable;

+            return dec.readMap();

         case 16: // int8

             return dec.readInt8();

         case 17: // int16

@@ -317,20 +302,7 @@ public class Session
                 enc.writeUuid((UUID) val);

                 break;

             case 15: // Ftable

-                Map<String, Object> ftable = (Map<String, Object>) val;

-                BBEncoder sc = new BBEncoder(1);

-                sc.init();

-                sc.writeUint32(ftable.size());

-                for (String key : ftable.keySet())

-                {

-                    Object obj = ftable.get(key);

-                    short innerType = Util.qmfType(obj);

-                    sc.writeStr8(key);

-                    sc.writeUint8(innerType);

-                    this.encodeValue(sc, innerType, obj);

-                }

-                byte[] bytes = sc.segment().array();

-                enc.writeVbin32(bytes);

+                enc.writeMap((HashMap) val);

                 break;

             case 16: // int8

                 enc.writeInt8((Byte) val);

@@ -1005,4 +977,4 @@ public class Session
             broker.waitForStable();

         }

     }

-}
\ No newline at end of file
+}