[asp.net] Ignore directories that don't exist instead of throwing.

[mono.git] / mcs / class / System.Web / System.Web.Util / WebEncoding.cs

diff --git a/mcs/class/System.Web/System.Web.Util/WebEncoding.cs b/mcs/class/System.Web/System.Web.Util/WebEncoding.cs
index 147eaa2ca17ea7271ac297a51ab1e83836e51974..09a190a97b2652735bdb73a91d36b25bf7f2abe5 100644 (file)
--- a/mcs/class/System.Web/System.Web.Util/WebEncoding.cs
+++ b/mcs/class/System.Web/System.Web.Util/WebEncoding.cs
@@ -8,6 +8,27 @@
 // (C) 2003 Novell, Inc (http://www.novell.com)
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System.Text;
 using System.Web.Configuration;
 
@@ -15,33 +36,44 @@ namespace System.Web.Util
 {
        internal class WebEncoding
        {
-               static public Encoding FileEncoding {
+#if NET_2_0
+               static bool cached;
+               static GlobalizationSection sect;
+               static GlobalizationSection GlobalizationConfig {
+                       get {
+                               if (!cached) {
+                                       try {
+                                               sect = (GlobalizationSection) WebConfigurationManager.GetWebApplicationSection ("system.web/globalization");
+                                       }
+                                       catch { }
+                                       cached = true;
+                               }
+                               return sect;
+                       }
+               }
+#else
+               static GlobalizationConfiguration GlobalizationConfig {
                        get {
-                               GlobalizationConfiguration gc = GlobalizationConfiguration.GetInstance (null);
-                               if (gc == null)
-                                       return Encoding.Default;
+                               return GlobalizationConfiguration.GetInstance (null);
+                       }
+               }
+#endif
 
-                               return gc.FileEncoding;
+               static public Encoding FileEncoding {
+                       get {
+                               return GlobalizationConfig != null ? GlobalizationConfig.FileEncoding : Encoding.Default;
                        }
                }
 
                static public Encoding ResponseEncoding {
                        get {
-                               GlobalizationConfiguration gc = GlobalizationConfiguration.GetInstance (null);
-                               if (gc == null)
-                                       return Encoding.Default;
-
-                               return gc.ResponseEncoding;
+                               return GlobalizationConfig != null ? GlobalizationConfig.ResponseEncoding : Encoding.Default;
                        }
                }
 
                static public Encoding RequestEncoding {
                        get {
-                               GlobalizationConfiguration gc = GlobalizationConfiguration.GetInstance (null);
-                               if (gc == null)
-                                       return Encoding.Default;
-
-                               return gc.RequestEncoding;
+                               return GlobalizationConfig != null ? GlobalizationConfig.RequestEncoding : Encoding.Default;
                        }
                }
        }