Connector/NET commit: r1527 - in branches/5.2: . MySql.Data/Provider/Source MySql.Data/Tests/Source

[rburnett]

Modified:
   branches/5.2/CHANGES
   branches/5.2/MySql.Data/Provider/Source/MySqlPoolManager.cs
   branches/5.2/MySql.Data/Tests/Source/PoolingTests.cs
Log:
- fixed bug where attempting to clear a pool twice would result in a null reference exception (bug #42801)    


Modified: branches/5.2/CHANGES
===================================================================
--- branches/5.2/CHANGES	2009-03-05 17:49:55 UTC (rev 1526)
+++ branches/5.2/CHANGES	2009-03-25 17:29:06 UTC (rev 1527)
@@ -20,6 +20,7 @@
 - fixed Sql null value exception when an attempt was made to reset the password and 
   require question and answer was false.  (bug #41408)  
 - fixed MySqlDataReader.GetGuid to be more robust in how it attempts to read guid values (bug #41452)     
+- fixed bug where attempting to clear a pool twice would result in a null reference exception (bug #42801)    
       
 Version 5.2.5 - 11/14/2008
 - fixed problem with package registration that kept the DDEX provider from working (bug #40726)

Modified: branches/5.2/MySql.Data/Provider/Source/MySqlPoolManager.cs
===================================================================
--- branches/5.2/MySql.Data/Provider/Source/MySqlPoolManager.cs	2009-03-05 17:49:55 UTC (rev 1526)
+++ branches/5.2/MySql.Data/Provider/Source/MySqlPoolManager.cs	2009-03-25 17:29:06 UTC (rev 1527)
@@ -87,6 +87,9 @@
         {
             lock (pools.SyncRoot)
             {
+                // if pools doesn't have it, then this pool must already have been cleared
+                if (!pools.ContainsKey(key)) return;
+
                 // add the pool to our list of pools being cleared
                 MySqlPool pool = (pools[key] as MySqlPool);
                 clearingPools.Add(pool);

Modified: branches/5.2/MySql.Data/Tests/Source/PoolingTests.cs
===================================================================
--- branches/5.2/MySql.Data/Tests/Source/PoolingTests.cs	2009-03-05 17:49:55 UTC (rev 1526)
+++ branches/5.2/MySql.Data/Tests/Source/PoolingTests.cs	2009-03-25 17:29:06 UTC (rev 1527)
@@ -818,8 +818,40 @@
 
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
\ No newline at end of file