merge -r 97125:97126

svn path=/branches/mainsoft/gh2.2/mcs/; revision=97127

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
index b12bba44f60515328de3f62d325c7b7b8cbefb61..df620f9c62c218889c9b780596e75ad9ebcdf795 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
@@ -1,3 +1,7 @@
+2008-03-03  Vladimir Krasnov  <vladimirk@mainsoft.com>
+
+       * ProvidersHelper.cs: fixed thread safety issue in InstantiateProvider
+
 2008-02-18  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * WebConfigurationManager.cs: performance improvement, cached

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/ProvidersHelper.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/ProvidersHelper.cs
index 0bfbe5695acd72b7c3e12ae555d1f42f0a82ae6a..e9b8dca4a8d064289ef8fbedfb5259ef09aa3db6 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/ProvidersHelper.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/ProvidersHelper.cs
@@ -39,6 +39,7 @@ using System.IO;
 using System.Reflection;
 using System.Web;
 using System.Web.Compilation;
+using System.Collections.Specialized;
 
 namespace System.Web.Configuration {
 
@@ -77,7 +78,8 @@ namespace System.Web.Configuration {
 
                        ProviderBase provider = Activator.CreateInstance (settingsType) as ProviderBase;
 
-                       provider.Initialize (providerSettings.Name, providerSettings.Parameters);
+                       NameValueCollection col = new NameValueCollection (providerSettings.Parameters);
+                       provider.Initialize (providerSettings.Name, col);
 
                        return provider;
                }