* Mono.Posix.dll.sources: Rename Mono.Posix to Mono.Unix.

[mono.git] / mcs / class / System.Web / System.Web / CapabilitiesLoader.cs

diff --git a/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs b/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
index 2a486a0ec3ce648ad4ebf95d4156d1b632bed9a8..ba974e836fc5ca6f77cab93165967d72ea673285 100644 (file)
--- a/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
+++ b/mcs/class/System.Web/System.Web/CapabilitiesLoader.cs
@@ -11,6 +11,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;
 using System.Collections;
 using System.Collections.Specialized;
@@ -58,12 +79,10 @@ namespace System.Web
 
                public void Add (string key, string value)
                {
-                       lock (this) {
-                               if (data == null)
-                                       data = new ListDictionary ();
+                       if (data == null)
+                               data = new ListDictionary ();
 
-                               data.Add (key, value);
-                       }
+                       data.Add (key, value);
                }
 
                public Hashtable GetProperties (Hashtable tbl)
@@ -110,10 +129,10 @@ namespace System.Web
                                expression = expression.Substring (text.Length);
                        }
                        
-                       lock (this) {
-                               if (pattern == null)
-                                       return expression.Length == 0;
+                       if (pattern == null)
+                               return expression.Length == 0;
 
+                       lock (this) {
                                if (regex == null)
                                        regex = new Regex (pattern);
                        }
@@ -149,6 +168,9 @@ namespace System.Web
 
                static void Init ()
                {
+                       if (loaded)
+                               return;
+
                        lock (typeof (CapabilitiesLoader)) {
                                if (loaded)
                                        return;
@@ -157,7 +179,7 @@ namespace System.Web
                                path = Path.Combine (path, "browscap.ini");
                                try {
                                        LoadFile (path);
-                               } catch (Exception e) { }
+                               } catch (Exception) { }
 
                                loaded = true;
                        }