Merge pull request #1582 from zevane/patch-1

Make the class thread-safe

1 files changed, 12 insertions, 9 deletions

diff --git a/mcs/class/System.Configuration/System.Configuration/ConfigurationSectionCollection.cs b/mcs/class/System.Configuration/System.Configuration/ConfigurationSectionCollection.cs
index 5b0f531e55d..925fb547eba 100644
--- a/mcs/class/System.Configuration/System.Configuration/ConfigurationSectionCollection.cs
+++ b/mcs/class/System.Configuration/System.Configuration/ConfigurationSectionCollection.cs
@@ -39,7 +39,8 @@ namespace System.Configuration
 	{
 		SectionGroupInfo group;
 		Configuration config;
-		
+		static readonly object lockObject = new object();
+		 
 		internal ConfigurationSectionCollection (Configuration config, SectionGroupInfo group)
 			: base (StringComparer.Ordinal)
 		{
@@ -60,15 +61,17 @@ namespace System.Configuration
 		public ConfigurationSection this [string name]
 		{
 			get {
-				ConfigurationSection sec = BaseGet (name) as ConfigurationSection;
-				if (sec == null) {
-					SectionInfo secData = group.Sections [name] as SectionInfo;
-					if (secData == null) return null;
-					sec = config.GetSectionInstance (secData, true);
-					if (sec == null) return null;
-					BaseSet (name, sec);
+				lock(lockObject) {
+					ConfigurationSection sec = BaseGet (name) as ConfigurationSection;
+					if (sec == null) {
+						SectionInfo secData = group.Sections [name] as SectionInfo;
+						if (secData == null) return null;
+						sec = config.GetSectionInstance (secData, true);
+						if (sec == null) return null;
+						BaseSet (name, sec);
+					}
+					return sec;
 				}
-				return sec;
 			}
 		}