fixup

rabbitmq · Oct 23, 2024 · d0a3e7e · d0a3e7e
1 parent 4ed28d7
commit d0a3e7e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/projects/RabbitMQ.Client/CreateChannelOptions.cs b/projects/RabbitMQ.Client/CreateChannelOptions.cs
@@ -103,10 +103,23 @@ internal CreateChannelOptions(ConnectionConfig connectionConfig)
             _connectionConfigContinuationTimeout = connectionConfig.ContinuationTimeout;
         }
 
-        internal void WithConnectionConfig(ConnectionConfig connectionConfig)
+        private void WithConnectionConfig(ConnectionConfig connectionConfig)
         {
             _connectionConfigConsumerDispatchConcurrency = connectionConfig.ConsumerDispatchConcurrency;
             _connectionConfigContinuationTimeout = connectionConfig.ContinuationTimeout;
         }
+
+        internal static CreateChannelOptions CreateOrUpdate(CreateChannelOptions? createChannelOptions, ConnectionConfig config)
+        {
+            if (createChannelOptions is not null)
+            {
+                createChannelOptions.WithConnectionConfig(config);
+                return createChannelOptions;
+            }
+            else
+            {
+                return new CreateChannelOptions(config);
+            }
+        }
     }
 }
diff --git a/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.cs b/projects/RabbitMQ.Client/Impl/AutorecoveringConnection.cs
@@ -256,15 +256,7 @@ public async Task<IChannel> CreateChannelAsync(CreateChannelOptions? createChann
         {
             EnsureIsOpen();
 
-            if (createChannelOptions is null)
-            {
-                createChannelOptions = new CreateChannelOptions(_config);
-            }
-            else
-            {
-                createChannelOptions.WithConnectionConfig(_config);
-            }
-
+            createChannelOptions = CreateChannelOptions.CreateOrUpdate(createChannelOptions, _config);
             RecoveryAwareChannel recoveryAwareChannel = await CreateNonRecoveringChannelAsync(createChannelOptions, cancellationToken)
                 .ConfigureAwait(false);
 

diff --git a/projects/RabbitMQ.Client/Impl/Connection.cs b/projects/RabbitMQ.Client/Impl/Connection.cs
@@ -268,15 +268,7 @@ public Task<IChannel> CreateChannelAsync(CreateChannelOptions? createChannelOpti
         {
             EnsureIsOpen();
 
-            if (createChannelOptions is null)
-            {
-                createChannelOptions = new CreateChannelOptions(_config);
-            }
-            else
-            {
-                createChannelOptions.WithConnectionConfig(_config);
-            }
-
+            createChannelOptions = CreateChannelOptions.CreateOrUpdate(createChannelOptions, _config);
             ISession session = CreateSession();
             return Channel.CreateAndOpenAsync(createChannelOptions, session, cancellationToken);
         }