Merge trunk to QPID-2519 branch

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-2519@1186990 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 5 insertions, 4 deletions

diff --git a/java/common/templates/model/MethodRegistryClass.vm b/java/common/templates/model/MethodRegistryClass.vm
index 759e5e4a42..8258175ce7 100644
--- a/java/common/templates/model/MethodRegistryClass.vm
+++ b/java/common/templates/model/MethodRegistryClass.vm
@@ -30,7 +30,8 @@
  
 package org.apache.qpid.framing;
 
-import org.apache.mina.common.ByteBuffer;
+import java.io.DataInputStream;
+import java.io.IOException;
 
 import org.apache.qpid.framing.abstraction.ProtocolVersionMethodConverter;
 
@@ -53,8 +54,8 @@ public abstract class MethodRegistry
 #end
  			
 			
-    public abstract AMQMethodBody convertToBody(ByteBuffer in, long size)
-        throws AMQFrameDecodingException;
+    public abstract AMQMethodBody convertToBody(DataInputStream in, long size)
+        throws AMQFrameDecodingException, IOException;
 
     public abstract int getMaxClassId();
 
@@ -101,4 +102,4 @@ public abstract class MethodRegistry
 
 	public abstract ProtocolVersionMethodConverter getProtocolVersionMethodConverter();
 	
-}
\ No newline at end of file
+}