Pool: Lock queues when clearing them

Brian Crowell · Brian Crowell · commit f774f2b5f89e · 2014-03-31T09:55:02.000-05:00
We lock queues in all other circumstances, so we need to be consistent.
diff --git a/Npgsql/Npgsql/NpgsqlConnectorPool.cs b/Npgsql/Npgsql/NpgsqlConnectorPool.cs
@@ -565,22 +565,25 @@ private static void ClearQueue(ConnectorQueue Queue)
                 return;
             }
 
-            while (Queue.Available.Count > 0)
+            lock (Queue)
             {
-                NpgsqlConnector connector = Queue.Available.Dequeue();
-
-                try
-                {
-                    connector.Close();
-                }
-                catch
+                while (Queue.Available.Count > 0)
                 {
-                    // Maybe we should log something here to say we got an exception while closing connector?
+                    NpgsqlConnector connector = Queue.Available.Dequeue();
+
+                    try
+                    {
+                        connector.Close();
+                    }
+                    catch
+                    {
+                        // Maybe we should log something here to say we got an exception while closing connector?
+                    }
                 }
-            }
 
-            //Clear the busy list so that the current connections don't get re-added to the queue
-            Queue.Busy.Clear();
+                //Clear the busy list so that the current connections don't get re-added to the queue
+                Queue.Busy.Clear();
+            }
         }
 
         internal void ClearPool(NpgsqlConnection Connection)
