Merge pull request #477 from Pliner/redundant-allocations

Remove redundant allocations

Author: kjnilsson

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

@@ -238,7 +238,10 @@ public void WriteFrameSet(IList<OutboundFrame> frames)
         {
             var ms = new MemoryStream();
             var nbw = new NetworkBinaryWriter(ms);
-            foreach (var f in frames) f.WriteTo(nbw);
+            for (var i = 0; i < frames.Count; ++i)
+            {
+                frames[i].WriteTo(nbw);
+            }
             m_socket.Client.Poll(m_writeableStateTimeout, SelectMode.SelectWrite);
             Write(ms.GetBufferSegment());
         }

projects/client/RabbitMQ.Client/src/util/NetworkBinaryReader.cs

@@ -38,7 +38,6 @@
 //  Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
-using System;
 using System.IO;
 using System.Text;
 
@@ -55,6 +54,8 @@ namespace RabbitMQ.Util
     /// </remarks>
     public class NetworkBinaryReader : BinaryReader
     {
+        private static readonly Encoding encoding = new UTF8Encoding();
+
         // Not particularly efficient. To be more efficient, we could
         // reuse BinaryReader's implementation details: m_buffer and
         // FillBuffer, if they weren't private
@@ -65,7 +66,7 @@ public class NetworkBinaryReader : BinaryReader
         /// <summary>
         /// Construct a NetworkBinaryReader over the given input stream.
         /// </summary>
-        public NetworkBinaryReader(Stream input) : base(input)
+        public NetworkBinaryReader(Stream input) : base(input, encoding)
         {
         }
 

projects/client/RabbitMQ.Client/src/util/NetworkBinaryWriter.cs

@@ -38,7 +38,6 @@
 //  Copyright (c) 2007-2016 Pivotal Software, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
-using System;
 using System.IO;
 using System.Text;
 
@@ -57,10 +56,12 @@ namespace RabbitMQ.Util
     /// </remarks>
     public class NetworkBinaryWriter : BinaryWriter
     {
+        private static readonly Encoding encoding = new UTF8Encoding(false, true);
+
         /// <summary>
         /// Construct a NetworkBinaryWriter over the given input stream.
         /// </summary>
-        public NetworkBinaryWriter(Stream output) : base(output)
+        public NetworkBinaryWriter(Stream output) : base(output, encoding)
         {
         }