diff options
Diffstat (limited to 'mcs/class/System.Web/System.Web.Util/WebEncoding.cs')
| -rw-r--r-- | mcs/class/System.Web/System.Web.Util/WebEncoding.cs | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/mcs/class/System.Web/System.Web.Util/WebEncoding.cs b/mcs/class/System.Web/System.Web.Util/WebEncoding.cs index cfc6a689d38..1e53db51d6b 100644 --- a/mcs/class/System.Web/System.Web.Util/WebEncoding.cs +++ b/mcs/class/System.Web/System.Web.Util/WebEncoding.cs @@ -36,44 +36,44 @@ namespace System.Web.Util { internal class WebEncoding { -#if NET_2_0 - static bool cached; - static GlobalizationSection sect; - static GlobalizationSection GlobalizationConfig { + static public Encoding FileEncoding { get { - if (!cached) { - try { - sect = (GlobalizationSection) WebConfigurationManager.GetSection ("system.web/globalization"); - } - catch { } - cached = true; - } - return sect; - } - } +#if CONFIGURATION_2_0 + GlobalizationSection gc = (GlobalizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/globalization"); #else - static GlobalizationConfiguration GlobalizationConfig { - get { - return GlobalizationConfiguration.GetInstance (null); - } - } + GlobalizationConfiguration gc = GlobalizationConfiguration.GetInstance (null); + if (gc == null) + return Encoding.Default; #endif - static public Encoding FileEncoding { - get { - return GlobalizationConfig != null ? GlobalizationConfig.FileEncoding : Encoding.Default; + return gc.FileEncoding; } } static public Encoding ResponseEncoding { get { - return GlobalizationConfig != null ? GlobalizationConfig.ResponseEncoding : Encoding.Default; +#if CONFIGURATION_2_0 + GlobalizationSection gc = (GlobalizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/globalization"); +#else + GlobalizationConfiguration gc = GlobalizationConfiguration.GetInstance (null); + if (gc == null) + return Encoding.Default; +#endif + + return gc.ResponseEncoding; } } static public Encoding RequestEncoding { get { - return GlobalizationConfig != null ? GlobalizationConfig.RequestEncoding : Encoding.Default; +#if CONFIGURATION_2_0 + GlobalizationSection gc = (GlobalizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/globalization"); +#else + GlobalizationConfiguration gc = GlobalizationConfiguration.GetInstance (null); + if (gc == null) + return Encoding.Default; +#endif + return gc.RequestEncoding; } } } |