Don't swallow exceptions unless abort is specified.

lukebakken · lukebakken · commit 5421696268c5 · 2024-01-26T08:29:01.000-08:00
diff --git a/projects/RabbitMQ.Client/client/impl/Connection.cs b/projects/RabbitMQ.Client/client/impl/Connection.cs
@@ -374,17 +374,7 @@ await _session0.TransmitAsync(method, cancellationToken)
                 await _mainLoopTask.WaitAsync(timeout, cancellationToken)
                     .ConfigureAwait(false);
             }
-            catch (AggregateException)
-            {
-            }
-            // TODO timeout vs real cancellation?
-            catch (OperationCanceledException)
-            {
-            }
-            catch (TimeoutException)
-            {
-            }
-            finally
+            catch
             {
                 try
                 {
@@ -395,6 +385,11 @@ await _frameHandler.CloseAsync()
                 catch
                 {
                 }
+
+                if (false == abort)
+                {
+                    throw;
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -374,17 +374,7 @@ await _session0.TransmitAsync(method, cancellationToken)`
`374`	`374`	`await _mainLoopTask.WaitAsync(timeout, cancellationToken)`
`375`	`375`	`.ConfigureAwait(false);`
`376`	`376`	`}`
`377`		`- catch (AggregateException)`
`378`		`- {`
`379`		`- }`
`380`		`- // TODO timeout vs real cancellation?`
`381`		`- catch (OperationCanceledException)`
`382`		`- {`
`383`		`- }`
`384`		`- catch (TimeoutException)`
`385`		`- {`
`386`		`- }`
`387`		`- finally`
	`377`	`+ catch`
`388`	`378`	`{`
`389`	`379`	`try`
`390`	`380`	`{`
`@@ -395,6 +385,11 @@ await _frameHandler.CloseAsync()`
`395`	`385`	`catch`
`396`	`386`	`{`
`397`	`387`	`}`
	`388`	`+`
	`389`	`+ if (false == abort)`
	`390`	`+ {`
	`391`	`+ throw;`
	`392`	`+ }`
`398`	`393`	`}`
`399`	`394`	`}`
`400`	`395`