Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@ -39,6 +39,7 @@ namespace System.Runtime.Serialization
if (!settingsInitalized)
{
NameValueCollection appSettingsSection = null;
#if !NO_CONFIGURATION
try
{
appSettingsSection = ConfigurationManager.AppSettings;
@ -48,13 +49,16 @@ namespace System.Runtime.Serialization
}
finally
{
#endif
if ((appSettingsSection == null) || !int.TryParse(appSettingsSection[MaxMimePartsAppSettingsString], out maxMimeParts))
{
maxMimeParts = DefaultMaxMimeParts;
}
settingsInitalized = true;
#if !NO_CONFIGURATION
}
#endif
}
}
}