Merge branch 'stable'

michaelklishin · michaelklishin · commit 3653cbef64ee · 2015-11-19T16:45:02.000+03:00
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs b/projects/client/RabbitMQ.Client/src/client/impl/Connection.cs
@@ -1219,17 +1219,13 @@ public void HandleConnectionUnblocked()
         void IDisposable.Dispose()
         {
             MaybeStopHeartbeatTimers();
-            Abort();
-            if (ShutdownReport.Count > 0)
+            try
             {
-                foreach (ShutdownReportEntry entry in ShutdownReport)
-                {
-                    if (entry.Exception != null)
-                    {
-                        throw entry.Exception;
-                    }
-                }
-                throw new OperationInterruptedException(null);
+                Abort();
+            }
+            catch (OperationInterruptedException ignored)
+            {
+                // ignored, see rabbitmq/rabbitmq-dotnet-client#133
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1219,17 +1219,13 @@ public void HandleConnectionUnblocked()`
`1219`	`1219`	`void IDisposable.Dispose()`
`1220`	`1220`	`{`
`1221`	`1221`	`MaybeStopHeartbeatTimers();`
`1222`		`- Abort();`
`1223`		`- if (ShutdownReport.Count > 0)`
	`1222`	`+ try`
`1224`	`1223`	`{`
`1225`		`- foreach (ShutdownReportEntry entry in ShutdownReport)`
`1226`		`- {`
`1227`		`- if (entry.Exception != null)`
`1228`		`- {`
`1229`		`- throw entry.Exception;`
`1230`		`- }`
`1231`		`- }`
`1232`		`- throw new OperationInterruptedException(null);`
	`1224`	`+ Abort();`
	`1225`	`+ }`
	`1226`	`+ catch (OperationInterruptedException ignored)`
	`1227`	`+ {`
	`1228`	`+ // ignored, see rabbitmq/rabbitmq-dotnet-client#133`
`1233`	`1229`	`}`
`1234`	`1230`	`}`
`1235`	`1231`