fixup

lukebakken · lukebakken · commit ca7854eef340 · 2024-01-31T16:09:23.000-08:00
diff --git a/projects/RabbitMQ.Client/client/api/IConnectionExtensions.cs b/projects/RabbitMQ.Client/client/api/IConnectionExtensions.cs
@@ -20,8 +20,8 @@ public static class IConnectionExtensions
         /// </remarks>
         public static Task CloseAsync(this IConnection connection)
         {
-            using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionCloseTimeout);
-            return connection.CloseAsync(Constants.ReplySuccess, "Goodbye", InternalConstants.DefaultConnectionCloseTimeout, false, cts.Token);
+            return connection.CloseAsync(Constants.ReplySuccess, "Goodbye", InternalConstants.DefaultConnectionCloseTimeout, false,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -39,8 +39,8 @@ public static Task CloseAsync(this IConnection connection)
         /// </remarks>
         public static Task CloseAsync(this IConnection connection, ushort reasonCode, string reasonText)
         {
-            using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionCloseTimeout);
-            return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionCloseTimeout, false, cts.Token);
+            return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionCloseTimeout, false,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -60,8 +60,8 @@ public static Task CloseAsync(this IConnection connection, ushort reasonCode, st
         /// </remarks>
         public static Task CloseAsync(this IConnection connection, TimeSpan timeout)
         {
-            using var cts = new CancellationTokenSource(timeout);
-            return connection.CloseAsync(Constants.ReplySuccess, "Goodbye", timeout, false, cts.Token);
+            return connection.CloseAsync(Constants.ReplySuccess, "Goodbye", timeout, false,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -83,8 +83,8 @@ public static Task CloseAsync(this IConnection connection, TimeSpan timeout)
         /// </remarks>
         public static Task CloseAsync(this IConnection connection, ushort reasonCode, string reasonText, TimeSpan timeout)
         {
-            using var cts = new CancellationTokenSource(timeout);
-            return connection.CloseAsync(reasonCode, reasonText, timeout, false, cts.Token);
+            return connection.CloseAsync(reasonCode, reasonText, timeout, false,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -98,8 +98,8 @@ public static Task CloseAsync(this IConnection connection, ushort reasonCode, st
         /// </remarks>
         public static Task AbortAsync(this IConnection connection)
         {
-            using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionAbortTimeout);
-            return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", InternalConstants.DefaultConnectionAbortTimeout, true, cts.Token);
+            return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", InternalConstants.DefaultConnectionAbortTimeout, true,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -117,8 +117,8 @@ public static Task AbortAsync(this IConnection connection)
         /// </remarks>
         public static Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText)
         {
-            using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionAbortTimeout);
-            return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionAbortTimeout, true, cts.Token);
+            return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionAbortTimeout, true,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -136,8 +136,8 @@ public static Task AbortAsync(this IConnection connection, ushort reasonCode, st
         /// </remarks>
         public static Task AbortAsync(this IConnection connection, TimeSpan timeout)
         {
-            using var cts = new CancellationTokenSource(timeout);
-            return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", timeout, true, cts.Token);
+            return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", timeout, true,
+                CancellationToken.None);
         }
 
         /// <summary>
@@ -156,8 +156,8 @@ public static Task AbortAsync(this IConnection connection, TimeSpan timeout)
         /// </remarks>
         public static Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText, TimeSpan timeout)
         {
-            using var cts = new CancellationTokenSource(timeout);
-            return connection.CloseAsync(reasonCode, reasonText, timeout, true, cts.Token);
+            return connection.CloseAsync(reasonCode, reasonText, timeout, true,
+                CancellationToken.None);
         }
     }
 }
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -484,14 +484,6 @@ public void Dispose()
                 }
 
                 _session0.Dispose();
-                /*
-                 * TODO dispose channel?
-                if (_channel0 != null && _channel0.IsOpen)
-                {
-                    IChannel ch0 = _channel0 as IChannel;
-                    ch0?.Dispose();
-                }
-                */
                 _mainLoopCts.Dispose();
             }
             catch (OperationInterruptedException)

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public static class IConnectionExtensions`
`20`	`20`	`/// </remarks>`
`21`	`21`	`public static Task CloseAsync(this IConnection connection)`
`22`	`22`	`{`
`23`		`- using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionCloseTimeout);`
`24`		`- return connection.CloseAsync(Constants.ReplySuccess, "Goodbye", InternalConstants.DefaultConnectionCloseTimeout, false, cts.Token);`
	`23`	`+ return connection.CloseAsync(Constants.ReplySuccess, "Goodbye", InternalConstants.DefaultConnectionCloseTimeout, false,`
	`24`	`+ CancellationToken.None);`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/// <summary>`
`@@ -39,8 +39,8 @@ public static Task CloseAsync(this IConnection connection)`
`39`	`39`	`/// </remarks>`
`40`	`40`	`public static Task CloseAsync(this IConnection connection, ushort reasonCode, string reasonText)`
`41`	`41`	`{`
`42`		`- using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionCloseTimeout);`
`43`		`- return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionCloseTimeout, false, cts.Token);`
	`42`	`+ return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionCloseTimeout, false,`
	`43`	`+ CancellationToken.None);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`/// <summary>`
`@@ -60,8 +60,8 @@ public static Task CloseAsync(this IConnection connection, ushort reasonCode, st`
`60`	`60`	`/// </remarks>`
`61`	`61`	`public static Task CloseAsync(this IConnection connection, TimeSpan timeout)`
`62`	`62`	`{`
`63`		`- using var cts = new CancellationTokenSource(timeout);`
`64`		`- return connection.CloseAsync(Constants.ReplySuccess, "Goodbye", timeout, false, cts.Token);`
	`63`	`+ return connection.CloseAsync(Constants.ReplySuccess, "Goodbye", timeout, false,`
	`64`	`+ CancellationToken.None);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/// <summary>`
`@@ -83,8 +83,8 @@ public static Task CloseAsync(this IConnection connection, TimeSpan timeout)`
`83`	`83`	`/// </remarks>`
`84`	`84`	`public static Task CloseAsync(this IConnection connection, ushort reasonCode, string reasonText, TimeSpan timeout)`
`85`	`85`	`{`
`86`		`- using var cts = new CancellationTokenSource(timeout);`
`87`		`- return connection.CloseAsync(reasonCode, reasonText, timeout, false, cts.Token);`
	`86`	`+ return connection.CloseAsync(reasonCode, reasonText, timeout, false,`
	`87`	`+ CancellationToken.None);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`/// <summary>`
`@@ -98,8 +98,8 @@ public static Task CloseAsync(this IConnection connection, ushort reasonCode, st`
`98`	`98`	`/// </remarks>`
`99`	`99`	`public static Task AbortAsync(this IConnection connection)`
`100`	`100`	`{`
`101`		`- using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionAbortTimeout);`
`102`		`- return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", InternalConstants.DefaultConnectionAbortTimeout, true, cts.Token);`
	`101`	`+ return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", InternalConstants.DefaultConnectionAbortTimeout, true,`
	`102`	`+ CancellationToken.None);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/// <summary>`
`@@ -117,8 +117,8 @@ public static Task AbortAsync(this IConnection connection)`
`117`	`117`	`/// </remarks>`
`118`	`118`	`public static Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText)`
`119`	`119`	`{`
`120`		`- using var cts = new CancellationTokenSource(InternalConstants.DefaultConnectionAbortTimeout);`
`121`		`- return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionAbortTimeout, true, cts.Token);`
	`120`	`+ return connection.CloseAsync(reasonCode, reasonText, InternalConstants.DefaultConnectionAbortTimeout, true,`
	`121`	`+ CancellationToken.None);`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`/// <summary>`
`@@ -136,8 +136,8 @@ public static Task AbortAsync(this IConnection connection, ushort reasonCode, st`
`136`	`136`	`/// </remarks>`
`137`	`137`	`public static Task AbortAsync(this IConnection connection, TimeSpan timeout)`
`138`	`138`	`{`
`139`		`- using var cts = new CancellationTokenSource(timeout);`
`140`		`- return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", timeout, true, cts.Token);`
	`139`	`+ return connection.CloseAsync(Constants.ReplySuccess, "Connection close forced", timeout, true,`
	`140`	`+ CancellationToken.None);`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`/// <summary>`
`@@ -156,8 +156,8 @@ public static Task AbortAsync(this IConnection connection, TimeSpan timeout)`
`156`	`156`	`/// </remarks>`
`157`	`157`	`public static Task AbortAsync(this IConnection connection, ushort reasonCode, string reasonText, TimeSpan timeout)`
`158`	`158`	`{`
`159`		`- using var cts = new CancellationTokenSource(timeout);`
`160`		`- return connection.CloseAsync(reasonCode, reasonText, timeout, true, cts.Token);`
	`159`	`+ return connection.CloseAsync(reasonCode, reasonText, timeout, true,`
	`160`	`+ CancellationToken.None);`
`161`	`161`	`}`
`162`	`162`	`}`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -484,14 +484,6 @@ public void Dispose()`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`_session0.Dispose();`
`487`		`- /*`
`488`		`- * TODO dispose channel?`
`489`		`- if (_channel0 != null && _channel0.IsOpen)`
`490`		`- {`
`491`		`- IChannel ch0 = _channel0 as IChannel;`
`492`		`- ch0?.Dispose();`
`493`		`- }`
`494`		`- */`
`495`	`487`	`_mainLoopCts.Dispose();`
`496`	`488`	`}`
`497`	`489`	`catch (OperationInterruptedException)`