Merge branch 'core-rtm' of github.com:StackExchange/StackExchange.Redis

StackExchange.Redis.StrongName/project.json

@@ -13,7 +13,7 @@
     }
   },
   "title": "StackExchange.Redis.StrongName",
-  "version": "1.1.607-*",
+  "version": "1.1.608-*",
   "description": "High performance Redis client, incorporating both synchronous and asynchronous usage.",
   "authors": [ "Stack Exchange inc., marc.gravell" ],
   "copyright": "Stack Exchange inc. 2014-",

StackExchange.Redis/StackExchange/Redis/ConnectionMultiplexer.cs

@@ -905,7 +905,11 @@ internal ServerEndPoint GetServerEndPoint(EndPoint endpoint)
                         if (isDisposed) throw new ObjectDisposedException(ToString());
 
                         server = new ServerEndPoint(this, endpoint, null);
+                        // ^^ this could indirectly cause servers to become changes, so treble-check!
+                        if (!servers.ContainsKey(endpoint))
+                        {
                             servers.Add(endpoint, server);
+                        }
 
                         var newSnapshot = serverSnapshot;
                         Array.Resize(ref newSnapshot, newSnapshot.Length + 1);
@@ -1226,8 +1230,12 @@ internal async Task<bool> ReconfigureAsync(bool first, bool reconfigureAll, Text
                             if (server == null)
                             {
                                 server = new ServerEndPoint(this, endpoint, log);
+                                // ^^ this could indirectly cause servers to become changes, so treble-check!
+                                if (!servers.ContainsKey(endpoint))
+                                {
                                     servers.Add(endpoint, server);
                                 }
+                            }
                             serverSnapshot[index++] = server;
                         }
                     }

StackExchange.Redis/project.json

@@ -13,7 +13,7 @@
     }
   },
   "title": "StackExchange.Redis",
-  "version": "1.1.607-*",
+  "version": "1.1.608-*",
   "description": "High performance Redis client, incorporating both synchronous and asynchronous usage.",
   "authors": [ "Stack Exchange inc., marc.gravell" ],
   "copyright": "Stack Exchange inc. 2014-",