CSHARP-1961: Fix bug in connection state transition.

rstam · rstam · commit a8797a34c254 · 2017-05-15T13:24:59.000-04:00
diff --git a/src/MongoDB.Driver.Core/Core/Connections/BinaryConnection.cs b/src/MongoDB.Driver.Core/Core/Connections/BinaryConnection.cs
@@ -1,4 +1,4 @@
-/* Copyright 2013-2016 MongoDB Inc.
+/* Copyright 2013-2017 MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -152,7 +152,7 @@ public ConnectionSettings Settings
         // methods
         private void ConnectionFailed(Exception exception)
         {
-            if (!_state.TryChange(State.Open, State.Failed))
+            if (!_state.TryChange(State.Open, State.Failed) && !_state.TryChange(State.Initializing, State.Failed))
             {
                 var currentState = _state.Value;
                 if (currentState != State.Failed && currentState != State.Disposed)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright 2013-2016 MongoDB Inc.`
	`1`	`+/* Copyright 2013-2017 MongoDB Inc.`
`2`	`2`	`*`
`3`	`3`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`* you may not use this file except in compliance with the License.`
`@@ -152,7 +152,7 @@ public ConnectionSettings Settings`
`152`	`152`	`// methods`
`153`	`153`	`private void ConnectionFailed(Exception exception)`
`154`	`154`	`{`
`155`		`- if (!_state.TryChange(State.Open, State.Failed))`
	`155`	`+ if (!_state.TryChange(State.Open, State.Failed) && !_state.TryChange(State.Initializing, State.Failed))`
`156`	`156`	`{`
`157`	`157`	`var currentState = _state.Value;`
`158`	`158`	`if (currentState != State.Failed && currentState != State.Disposed)`