Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -7,7 +7,8 @@ LIBRARY = System.Configuration.dll
LOCAL_MCS_FLAGS = -lib:$(secxml_libdir) -lib:$(bare_libdir)
test_remove = $(LOCAL_MCS_FLAGS)
LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Security.dll -nowarn:618
LIB_REFS = System System.Xml System.Security
LIB_MCS_FLAGS = -r:$(corlib) -nowarn:618
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
include ../../build/library.make

View File

@@ -61,17 +61,17 @@ namespace System.Configuration
public ConfigurationSection this [string name]
{
get {
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;
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;
lock(lockObject) {
BaseSet (name, sec);
}
return sec;
}
return sec;
}
}