Merge bug25374

Author: Simon MacMullen

projects/client/RabbitMQ.Client/src/client/impl/WireFormatting.cs

@@ -177,7 +177,7 @@ public static object ReadFieldValue(NetworkBinaryReader reader)
                       value = ReadArray(reader);
                       break;
                   case 'b':
-                      value = ReadOctet(reader);
+                      value = reader.ReadSByte();
                       break;
                   case 'd':
                       value = reader.ReadDouble();
@@ -435,10 +435,10 @@ public static void WriteFieldValue(NetworkBinaryWriter writer, object value)
                 WriteOctet(writer, (byte)'A');
                 WriteArray(writer, (IList)value);
             }
-            else if (value is byte)
+            else if (value is sbyte)
             {
                 WriteOctet(writer, (byte)'b');
-                WriteOctet(writer, (byte)value);
+                writer.Write((sbyte)value);
             }
             else if (value is double)
             {

projects/client/Unit/src/unit/TestFieldTableFormatting.cs

@@ -117,7 +117,7 @@ public void TestQpidJmsTypes()
         {
             NetworkBinaryWriter w = Writer();
             Hashtable t = new Hashtable();
-            t["b"] = (byte)123;
+            t["b"] = (sbyte)-128;
             t["d"] = (double)123;
             t["f"] = (float)123;
             t["l"] = (long)123;
@@ -128,7 +128,7 @@ public void TestQpidJmsTypes()
             t["V"] = null;
             WireFormatting.WriteTable(w, t);
             IDictionary nt = (IDictionary)WireFormatting.ReadTable(Reader(Contents(w)));
-            Assert.AreEqual(typeof(byte), nt["b"].GetType()); Assert.AreEqual((byte)123, nt["b"]);
+            Assert.AreEqual(typeof(sbyte), nt["b"].GetType()); Assert.AreEqual((sbyte)-128, nt["b"]);
             Assert.AreEqual(typeof(double), nt["d"].GetType()); Assert.AreEqual((double)123, nt["d"]);
             Assert.AreEqual(typeof(float), nt["f"].GetType()); Assert.AreEqual((float)123, nt["f"]);
             Assert.AreEqual(typeof(long), nt["l"].GetType()); Assert.AreEqual((long)123, nt["l"]);

projects/client/Unit/src/unit/TestFieldTableFormattingGeneric.cs

@@ -119,7 +119,7 @@ public void TestQpidJmsTypes()
         {
             NetworkBinaryWriter w = Writer();
             IDictionary<string, object> t = new Dictionary<string, object>();
-            t["b"] = (byte)123;
+            t["b"] = (sbyte)-128;
             t["d"] = (double)123;
             t["f"] = (float)123;
             t["l"] = (long)123;
@@ -130,7 +130,7 @@ public void TestQpidJmsTypes()
             t["V"] = null;
             WireFormatting.WriteTable(w, t);
             IDictionary nt = (IDictionary)WireFormatting.ReadTable(Reader(Contents(w)));
-            Assert.AreEqual(typeof(byte), nt["b"].GetType()); Assert.AreEqual((byte)123, nt["b"]);
+            Assert.AreEqual(typeof(sbyte), nt["b"].GetType()); Assert.AreEqual((sbyte)-128, nt["b"]);
             Assert.AreEqual(typeof(double), nt["d"].GetType()); Assert.AreEqual((double)123, nt["d"]);
             Assert.AreEqual(typeof(float), nt["f"].GetType()); Assert.AreEqual((float)123, nt["f"]);
             Assert.AreEqual(typeof(long), nt["l"].GetType()); Assert.AreEqual((long)123, nt["l"]);