Merge bug26071

Simon MacMullen · Simon MacMullen · commit 4416c592626d · 2014-03-25T10:47:32.000Z
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs b/projects/client/RabbitMQ.Client/src/client/impl/ModelBase.cs
@@ -1413,7 +1413,9 @@ public ConnectionSecureOrTune ConnectionStartOk(IDictionary<string, object> clie
             }
             catch (AlreadyClosedException)
             {
-                // Ignored, see BasicGet
+                // let continuation throw OperationInterruptedException,
+                // which is a much more suitable exception before connection
+                // negotiation finishes
             }
             k.GetReply();
             return k.m_result;
@@ -1442,7 +1444,9 @@ public ConnectionSecureOrTune ConnectionSecureOk(byte[] response)
             }
             catch (AlreadyClosedException)
             {
-                // Ignored, see BasicGet
+                // let continuation throw OperationInterruptedException,
+                // which is a much more suitable exception before connection
+                // negotiation finishes
             }
             k.GetReply();
             return k.m_result;
@@ -1487,7 +1491,9 @@ public string ConnectionOpen(string virtualHost,
             }
             catch (AlreadyClosedException)
             {
-                // Ignored, see BasicGet
+                // let continuation throw OperationInterruptedException,
+                // which is a much more suitable exception before connection
+                // negotiation finishes
             }
             k.GetReply();
             if (k.m_redirect) {

Original file line number	Diff line number	Diff line change
`@@ -1413,7 +1413,9 @@ public ConnectionSecureOrTune ConnectionStartOk(IDictionary<string, object> clie`
`1413`	`1413`	`}`
`1414`	`1414`	`catch (AlreadyClosedException)`
`1415`	`1415`	`{`
`1416`		`- // Ignored, see BasicGet`
	`1416`	`+ // let continuation throw OperationInterruptedException,`
	`1417`	`+ // which is a much more suitable exception before connection`
	`1418`	`+ // negotiation finishes`
`1417`	`1419`	`}`
`1418`	`1420`	`k.GetReply();`
`1419`	`1421`	`return k.m_result;`
`@@ -1442,7 +1444,9 @@ public ConnectionSecureOrTune ConnectionSecureOk(byte[] response)`
`1442`	`1444`	`}`
`1443`	`1445`	`catch (AlreadyClosedException)`
`1444`	`1446`	`{`
`1445`		`- // Ignored, see BasicGet`
	`1447`	`+ // let continuation throw OperationInterruptedException,`
	`1448`	`+ // which is a much more suitable exception before connection`
	`1449`	`+ // negotiation finishes`
`1446`	`1450`	`}`
`1447`	`1451`	`k.GetReply();`
`1448`	`1452`	`return k.m_result;`
`@@ -1487,7 +1491,9 @@ public string ConnectionOpen(string virtualHost,`
`1487`	`1491`	`}`
`1488`	`1492`	`catch (AlreadyClosedException)`
`1489`	`1493`	`{`
`1490`		`- // Ignored, see BasicGet`
	`1494`	`+ // let continuation throw OperationInterruptedException,`
	`1495`	`+ // which is a much more suitable exception before connection`
	`1496`	`+ // negotiation finishes`
`1491`	`1497`	`}`
`1492`	`1498`	`k.GetReply();`
`1493`	`1499`	`if (k.m_redirect) {`