switched to one byte for class/method ids

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

2 files changed, 3 insertions, 3 deletions

diff --git a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
index e17b37bb36..7bd82e7cf5 100644
--- a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Assembler.java
@@ -165,7 +165,7 @@ public class Assembler implements Receiver<NetworkEvent>, NetworkDelegate
         switch (type)
         {
         case Frame.METHOD:
-            int methodType = (int) dec.readLong();
+            int methodType = dec.readShort();
             Method method = Method.create(methodType);
             method.read(dec, major, minor);
             return method;
diff --git a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
index 6315d00150..770595922b 100644
--- a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
+++ b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/Disassembler.java
@@ -110,14 +110,14 @@ public class Disassembler implements Sender<ConnectionEvent>,
     public void method(ConnectionEvent event, Method method)
     {
         SizeEncoder sizer = new SizeEncoder(major, minor);
-        sizer.writeLong(method.getEncodedType());
+        sizer.writeShort(method.getEncodedType());
         method.write(sizer, major, minor);
         sizer.flush();
         int size = sizer.getSize();
 
         ByteBuffer buf = ByteBuffer.allocate(size);
         BBEncoder enc = new BBEncoder(major, minor, buf);
-        enc.writeLong(method.getEncodedType());
+        enc.writeShort(method.getEncodedType());
         method.write(enc, major, minor);
         enc.flush();
         buf.flip();