You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2006/12/22 21:46:55 UTC

svn commit: r489754 - /incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java

Author: rgreig
Date: Fri Dec 22 12:46:54 2006
New Revision: 489754

URL: http://svn.apache.org/viewvc?view=rev&rev=489754
Log:
QPID-229 : Patch supplied by Rob Godfrey - Change implementation of FieldTable

Modified:
    incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java

Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java?view=diff&rev=489754&r1=489753&r2=489754
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/framing/EncodingUtils.java Fri Dec 22 12:46:54 2006
@@ -48,19 +48,6 @@
         }
     }
 
-    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 @@
         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)
@@ -338,24 +312,6 @@
         // TODO: New Content class required for AMQP 0-9.
         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)
     {