Merge pull request #14 from spotware/dev

Fixed the issue with using array pool instead of allocating new array…
spotware · Mar 28, 2022 · 13c9679 · 13c9679
2 parents 0982e94 + 47664b7
commit 13c9679
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/OpenAPI.Net/OpenAPI.Net.csproj b/src/OpenAPI.Net/OpenAPI.Net.csproj
@@ -9,7 +9,7 @@
     <PackageTags>cTrader, Open API, Spotware, cTrader</PackageTags>
     <Description>A .NET RX library for cTrader Open API</Description>
     <PackageId>cTrader.OpenAPI.Net</PackageId>
-    <Version>1.4.1</Version>
+    <Version>1.4.2</Version>
     <Platforms>AnyCPU</Platforms>
     <Company>Spotware</Company>
     <Authors>Spotware</Authors>

diff --git a/src/OpenAPI.Net/OpenClient.cs b/src/OpenAPI.Net/OpenClient.cs
@@ -378,6 +378,7 @@ private async Task StartSendingMessages(CancellationToken cancellationToken)
         private async void ReadTcp(CancellationToken cancellationToken)
         {
             var dataLength = new byte[4];
+            byte[] data = null;
 
             try
             {
@@ -399,13 +400,13 @@ private async void ReadTcp(CancellationToken cancellationToken)
 
                     if (length <= 0) continue;
 
-                    var data = new byte[length];
+                    data = ArrayPool<byte>.Shared.Rent(length);
 
                     readBytes = 0;
 
                     do
                     {
-                        var count = data.Length - readBytes;
+                        var count = length - readBytes;
 
                         readBytes += await _sslStream.ReadAsync(data, readBytes, count, cancellationToken).ConfigureAwait(false);
 
@@ -415,11 +416,15 @@ private async void ReadTcp(CancellationToken cancellationToken)
 
                     var message = ProtoMessage.Parser.ParseFrom(data, 0, length);
 
+                    ArrayPool<byte>.Shared.Return(data);
+
                     OnNext(message);
                 }
             }
             catch (Exception ex)
             {
+                if (data is not null) ArrayPool<byte>.Shared.Return(data);
+
                 var exception = new ReceiveException(ex);
 
                 OnError(exception);