1 files changed, 41 insertions, 40 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
index 14fb63da03..f3da64e639 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/framing/AMQType.java
@@ -20,8 +20,9 @@
  */
 package org.apache.qpid.framing;
 
-import org.apache.mina.common.ByteBuffer;
-
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
 import java.math.BigDecimal;
 
 /**
@@ -60,12 +61,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeLongStringBytes(buffer, (String) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readLongString(buffer);
         }
@@ -106,12 +107,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeUnsignedInteger(buffer, (Long) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readUnsignedInteger(buffer);
         }
@@ -137,7 +138,7 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             BigDecimal bd = (BigDecimal) value;
 
@@ -150,7 +151,7 @@ public enum AMQType
             EncodingUtils.writeInteger(buffer, unscaled);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             byte places = EncodingUtils.readByte(buffer);
 
@@ -182,12 +183,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeLong(buffer, (Long) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readLong(buffer);
         }
@@ -246,7 +247,7 @@ public enum AMQType
          * @param value  An instance of the type.
          * @param buffer The byte buffer to write it to.
          */
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             // Ensure that the value is a FieldTable.
             if (!(value instanceof FieldTable))
@@ -267,7 +268,7 @@ public enum AMQType
          *
          * @return An instance of the type.
          */
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             try
             {
@@ -301,10 +302,10 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer)
         { }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer)
         {
             return null;
         }
@@ -330,12 +331,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeLongstr(buffer, (byte[]) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readLongstr(buffer);
         }
@@ -360,12 +361,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeLongStringBytes(buffer, (String) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readLongString(buffer);
         }
@@ -391,12 +392,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeLongStringBytes(buffer, (String) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readLongString(buffer);
         }
@@ -426,12 +427,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeBoolean(buffer, (Boolean) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readBoolean(buffer);
         }
@@ -461,12 +462,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeChar(buffer, (Character) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readChar(buffer);
         }
@@ -496,12 +497,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeByte(buffer, (Byte) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readByte(buffer);
         }
@@ -535,12 +536,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeShort(buffer, (Short) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readShort(buffer);
         }
@@ -577,12 +578,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeInteger(buffer, (Integer) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readInteger(buffer);
         }
@@ -624,12 +625,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeLong(buffer, (Long) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readLong(buffer);
         }
@@ -659,12 +660,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeFloat(buffer, (Float) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readFloat(buffer);
         }
@@ -698,12 +699,12 @@ public enum AMQType
             }
         }
 
-        public void writeValueImpl(Object value, ByteBuffer buffer)
+        public void writeValueImpl(Object value, DataOutputStream buffer) throws IOException
         {
             EncodingUtils.writeDouble(buffer, (Double) value);
         }
 
-        public Object readValueFromBuffer(ByteBuffer buffer)
+        public Object readValueFromBuffer(DataInputStream buffer) throws IOException
         {
             return EncodingUtils.readDouble(buffer);
         }
@@ -770,9 +771,9 @@ public enum AMQType
      * @param value  An instance of the type.
      * @param buffer The byte buffer to write it to.
      */
-    public void writeToBuffer(Object value, ByteBuffer buffer)
+    public void writeToBuffer(Object value, DataOutputStream buffer) throws IOException
     {
-        buffer.put(identifier());
+        buffer.writeByte(identifier());
         writeValueImpl(value, buffer);
     }
 
@@ -782,7 +783,7 @@ public enum AMQType
      * @param value  An instance of the type.
      * @param buffer The byte buffer to write it to.
      */
-    abstract void writeValueImpl(Object value, ByteBuffer buffer);
+    abstract void writeValueImpl(Object value, DataOutputStream buffer) throws IOException;
 
     /**
      * Reads an instance of the type from a specified byte buffer.
@@ -791,5 +792,5 @@ public enum AMQType
      *
      * @return An instance of the type.
      */
-    abstract Object readValueFromBuffer(ByteBuffer buffer);
+    abstract Object readValueFromBuffer(DataInputStream buffer) throws IOException;
 }