QPID-229 : Patch supplied by Rob Godfrey - Change implementation of FieldTable

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

1 files changed, 1 insertions, 45 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
index 8a1bf7fc75..ebda2c5d2b 100644
--- a/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
+++ b/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
@@ -48,19 +48,6 @@ public class EncodingUtils
         }
     }
 
-    public static int encodedShortStringLength(AMQShortString s)
-    {
-        if (s == null)
-        {
-            return 1;
-        }
-        else
-        {
-            return (short) (1 + s.length());
-        }
-    }
-
-
     public static int encodedLongStringLength(String s)
     {
         if (s == null)
@@ -117,20 +104,7 @@ public class EncodingUtils
         return 0;
     }
 
-    public static void writeShortStringBytes(ByteBuffer buffer, AMQShortString s)
-    {
-
-        if (s != null)
-        {
-            writeBytes(buffer, s.getBytes());
-        }
-        else
-        {
-            // really writing out unsigned byte
-            buffer.put((byte) 0);
-        }
-    }
-
+ 
     public static void writeShortStringBytes(ByteBuffer buffer, String s)
     {
         if (s != null)
@@ -339,24 +313,6 @@ public class EncodingUtils
         return null;
     }
 
-    public static AMQShortString readShortStringAsAMQShortString(ByteBuffer buffer)
-    {
-        short length = buffer.getUnsigned();
-        if (length == 0)
-        {
-            return null;
-        }
-        else
-        {
-            byte[] stringBytes = new byte[length];
-            buffer.get(stringBytes, 0, length);
-
-            return new AMQShortString(stringBytes);
-        }
-    }
-
-
-
     public static String readShortString(ByteBuffer buffer)
     {
         short length = buffer.getUnsigned();