Revert accidental change to ValueWriter and Frame.

Author: Steve Powell

src/com/rabbitmq/client/impl/Frame.java

@@ -328,9 +328,6 @@ else if(value instanceof byte[]) {
         else if(value instanceof List) {
             acc += 4 + arraySize((List<?>)value);
         }
-        else if(value instanceof Object[]) {
-            acc += 4 + arraySize((Object[])value);
-        }
         else if(value == null) {
         }
         else {
@@ -349,17 +346,6 @@ public static long arraySize(List<?> values)
         }
         return acc;
     }
-
-    /** Computes the AMQP wire-protocol length of an encoded field-array */
-    public static long arraySize(Object[] values)
-        throws UnsupportedEncodingException
-    {
-        long acc = 0;
-        for (Object value : values) {
-            acc += fieldValueSize(value);
-        }
-        return acc;
-    }
 
     /** Computes the AMQP wire-protocol length of a protocol-encoded long string. */
     private static int longStrSize(String str)

src/com/rabbitmq/client/impl/ValueWriter.java

@@ -189,43 +189,25 @@ else if(value instanceof List) {
             writeOctet('A');
             writeArray((List<?>)value);
         }
-        else if(value instanceof Object[]) {
-            writeOctet('A');
-            writeArray((Object[])value);
-        }
         else {
             throw new IllegalArgumentException
                 ("Invalid value type: " + value.getClass().getName());
         }
     }
 
     public void writeArray(List<?> value)
-    throws IOException
-{
-    if (value==null) {
-        out.write(0);
-    }
-    else {
-        out.writeInt((int)Frame.arraySize(value));
-        for (Object item : value) {
-            writeFieldValue(item);
+        throws IOException
+    {
+        if (value==null) {
+            out.write(0);
         }
-    }
-}
-
-    public void writeArray(Object[] value)
-    throws IOException
-{
-    if (value==null) {
-        out.write(0);
-    }
-    else {
-        out.writeInt((int)Frame.arraySize(value));
-        for (Object item : value) {
-            writeFieldValue(item);
+        else {
+            out.writeInt((int)Frame.arraySize(value));
+            for (Object item : value) {
+                writeFieldValue(item);
+            }
         }
     }
-}
 
     /** Public API - encodes an octet from an int. */
     public final void writeOctet(int octet)