Consolidate some duplicated code

rabbitmq · Dec 3, 2024 · 16c54d6 · 16c54d6
1 parent 37d086a
commit 16c54d6
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/RabbitMQ.AMQP.Client/ConnectionSettings.cs b/RabbitMQ.AMQP.Client/ConnectionSettings.cs
@@ -231,10 +231,7 @@ public ConnectionSettings(Uri uri,
                 path: "/",
                 scheme: scheme);
 
-            if (_address.UseSsl && _tlsSettings == null)
-            {
-                _tlsSettings = new TlsSettings();
-            }
+            _tlsSettings = InitTlsSettings();
         }
 
         public ConnectionSettings(string scheme,
@@ -255,19 +252,19 @@ public ConnectionSettings(string scheme,
                 throw new ArgumentOutOfRangeException(nameof(scheme), "scheme must be 'amqp' or 'amqps'");
             }
 
-            _address = new Address(host: host, port: port,
-                user: user, password: password,
-                path: "/", scheme: scheme);
+            _address = new Address(host: host,
+                port: port,
+                user: user,
+                password: password,
+                path: "/",
+                scheme: scheme);
 
             if (virtualHost is not null)
             {
                 _virtualHost = virtualHost;
             }
 
-            if (_address.UseSsl && _tlsSettings == null)
-            {
-                _tlsSettings = new TlsSettings();
-            }
+            _tlsSettings = InitTlsSettings();
         }
 
         protected ConnectionSettings(
@@ -424,6 +421,18 @@ protected static string ProcessUriSegmentsForVirtualHost(Uri uri)
             }
         }
 
+        private TlsSettings? InitTlsSettings()
+        {
+            if (_address.UseSsl && _tlsSettings is null)
+            {
+                return new TlsSettings();
+            }
+            else
+            {
+                return null;
+            }
+        }
+
         ///<summary>
         /// Unescape a string, protecting '+'.
         /// </summary>