Merge pull request #240 from trivalik/memoryOptimization

do not create empty arrays
convertersystems · Jan 5, 2023 · c9e05d8 · c9e05d8
2 parents daa3563 + 094217d
commit c9e05d8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/UaClient/Collections/ErrorsContainer.cs b/UaClient/Collections/ErrorsContainer.cs
@@ -13,7 +13,7 @@ namespace Workstation.Collections
     /// <typeparam name="T">The type of the error object.</typeparam>
     public class ErrorsContainer<T>
     {
-        private static readonly T[] _noErrors = new T[0];
+        private static readonly T[] _noErrors = Array.Empty<T>();
         private readonly Action<string> _raiseErrorsChanged;
         private readonly Dictionary<string, List<T>> _validationResults;
 

diff --git a/UaClient/ServiceModel/Ua/Channels/ClientSessionChannel.cs b/UaClient/ServiceModel/Ua/Channels/ClientSessionChannel.cs
@@ -9,9 +9,8 @@
 using System.Threading.Tasks.Dataflow;
 using Microsoft.Extensions.Logging;
 using Org.BouncyCastle.Crypto;
-using Org.BouncyCastle.Security;
-using System.Collections.Generic;
 using Org.BouncyCastle.Crypto.Parameters;
+using Org.BouncyCastle.Security;
 using Org.BouncyCastle.X509;
 
 namespace Workstation.ServiceModel.Ua.Channels
@@ -619,7 +618,7 @@ protected override async Task OnOpenAsync(CancellationToken token = default)
                     throw new ServiceResultException(StatusCodes.BadIdentityTokenRejected);
                 }
 
-                byte[] passwordBytes = userNameIdentity.Password != null ? System.Text.Encoding.UTF8.GetBytes(userNameIdentity.Password) : new byte[0];
+                byte[] passwordBytes = userNameIdentity.Password != null ? System.Text.Encoding.UTF8.GetBytes(userNameIdentity.Password) : Array.Empty<byte>();
                 int plainTextLength = passwordBytes.Length + RemoteNonce!.Length;
                 IBufferedCipher encryptor;
                 byte[] cipherText;
@@ -809,7 +808,7 @@ private async Task PublishAsync(CancellationToken token = default)
             var publishRequest = new PublishRequest
             {
                 RequestHeader = new RequestHeader { TimeoutHint = _publishTimeoutHint, ReturnDiagnostics = _options.DiagnosticsHint },
-                SubscriptionAcknowledgements = new SubscriptionAcknowledgement[0]
+                SubscriptionAcknowledgements = Array.Empty<SubscriptionAcknowledgement>()
             };
             while (!token.IsCancellationRequested)
             {
@@ -836,7 +835,7 @@ private async Task PublishAsync(CancellationToken token = default)
                                 SubscriptionId = publishResponse.SubscriptionId
                             }
                         }
-                        : new SubscriptionAcknowledgement[0]
+                        : Array.Empty<SubscriptionAcknowledgement>()
                     };
                 }
                 catch (Exception ex)

diff --git a/UaClient/ServiceModel/Ua/EventHelper.cs b/UaClient/ServiceModel/Ua/EventHelper.cs
@@ -81,7 +81,7 @@ private static void RegisterSelectClauseAndDeserializer(Type type)
                 var clause = new SimpleAttributeOperand
                 {
                     TypeDefinitionId = NodeId.Parse(efa.TypeDefinitionId!),
-                    BrowsePath = !String.IsNullOrWhiteSpace(efa.BrowsePath) ? efa.BrowsePath!.Split('/').Select(s => QualifiedName.Parse(s)).ToArray() : new QualifiedName[0],
+                    BrowsePath = !String.IsNullOrWhiteSpace(efa.BrowsePath) ? efa.BrowsePath!.Split('/').Select(s => QualifiedName.Parse(s)).ToArray() : Array.Empty<QualifiedName>(),
                     AttributeId = efa.AttributeId,
                     IndexRange = efa.IndexRange
                 };