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

@@ -516,6 +516,8 @@ namespace System.Text
break;
default:
result = (Encoding)(EncodingHelper.InvokeI18N ("GetEncoding", codepage));
if (result == null)
throw new NotSupportedException(Environment.GetResourceString("NotSupported_NoCodepageData", codepage));
break;
}
#else
@@ -709,7 +711,11 @@ namespace System.Text
{
get
{
#if MONO
return (Environment.GetResourceStringEncodingName(m_codePage));
#else
return (Environment.GetResourceString("Globalization.cp_" + m_codePage));
#endif
}
}