Dispose method should not throw an exception

micdenny · micdenny · commit 47bd34ca58a3 · 2015-08-18T12:15:53.000+02:00
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs
@@ -300,18 +300,25 @@ public void Close(ShutdownEventArgs reason, bool abort)
                 k.Wait();
                 ConsumerDispatcher.Shutdown(this);
             }
-            catch (AlreadyClosedException ace)
+            catch (AlreadyClosedException)
+            {
+                if (!abort)
+                {
+                    throw;
+                }
+            }
+            catch (IOException)
             {
                 if (!abort)
                 {
-                    throw ace;
+                    throw;
                 }
             }
-            catch (IOException ioe)
+            catch (Exception)
             {
                 if (!abort)
                 {
-                    throw ioe;
+                    throw;
                 }
             }
         }
@@ -673,7 +680,7 @@ public void TransmitAndEnqueue(Command cmd, IRpcContinuation k)
 
         void IDisposable.Dispose()
         {
-            Close();
+            Abort();
         }
 
         public abstract void ConnectionTuneOk(ushort channelMax,

Original file line number	Diff line number	Diff line change
`@@ -300,18 +300,25 @@ public void Close(ShutdownEventArgs reason, bool abort)`
`300`	`300`	`k.Wait();`
`301`	`301`	`ConsumerDispatcher.Shutdown(this);`
`302`	`302`	`}`
`303`		`- catch (AlreadyClosedException ace)`
	`303`	`+ catch (AlreadyClosedException)`
	`304`	`+ {`
	`305`	`+ if (!abort)`
	`306`	`+ {`
	`307`	`+ throw;`
	`308`	`+ }`
	`309`	`+ }`
	`310`	`+ catch (IOException)`
`304`	`311`	`{`
`305`	`312`	`if (!abort)`
`306`	`313`	`{`
`307`		`- throw ace;`
	`314`	`+ throw;`
`308`	`315`	`}`
`309`	`316`	`}`
`310`		`- catch (IOException ioe)`
	`317`	`+ catch (Exception)`
`311`	`318`	`{`
`312`	`319`	`if (!abort)`
`313`	`320`	`{`
`314`		`- throw ioe;`
	`321`	`+ throw;`
`315`	`322`	`}`
`316`	`323`	`}`
`317`	`324`	`}`
`@@ -673,7 +680,7 @@ public void TransmitAndEnqueue(Command cmd, IRpcContinuation k)`
`673`	`680`
`674`	`681`	`void IDisposable.Dispose()`
`675`	`682`	`{`
`676`		`- Close();`
	`683`	`+ Abort();`
`677`	`684`	`}`
`678`	`685`
`679`	`686`	`public abstract void ConnectionTuneOk(ushort channelMax,`