Author: mhabersack
Date: 2008-02-05 10:53:38 -0500 (Tue, 05 Feb 2008)
New Revision: 94899

Modified:
   branches/mono-1-9/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
   
branches/mono-1-9/mcs/class/System.Web/System.Web.Configuration_2.0/CompilerCollection.cs
Log:
Backport of r94898


Modified: 
branches/mono-1-9/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog
===================================================================
--- 
branches/mono-1-9/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog   
    2008-02-05 15:52:25 UTC (rev 94898)
+++ 
branches/mono-1-9/mcs/class/System.Web/System.Web.Configuration_2.0/ChangeLog   
    2008-02-05 15:53:38 UTC (rev 94899)
@@ -1,3 +1,12 @@
+2008-02-05  Marek Habersack  <[EMAIL PROTECTED]>
+
+       * CompilerCollection.cs: Get (string language) should not use
+       BaseGet as our collection is keyed on a list of language names
+       (e.g. "cs;csharp") and passing a single language won't match in
+       BaseGet correctly. Use the overriden indexer instead.
+       Initialize the base class with the case-insensitive
+       comparer. Fixes bug #357824.
+
 2008-01-27  Daniel Nauck <[EMAIL PROTECTED]>
 
        * HttpHandlerAction.cs: fixed the internal method PathMatches ()

Modified: 
branches/mono-1-9/mcs/class/System.Web/System.Web.Configuration_2.0/CompilerCollection.cs
===================================================================
--- 
branches/mono-1-9/mcs/class/System.Web/System.Web.Configuration_2.0/CompilerCollection.cs
   2008-02-05 15:52:25 UTC (rev 94898)
+++ 
branches/mono-1-9/mcs/class/System.Web/System.Web.Configuration_2.0/CompilerCollection.cs
   2008-02-05 15:53:38 UTC (rev 94899)
@@ -31,6 +31,7 @@
 #if NET_2_0
 
 using System;
+using System.Collections;
 using System.Configuration;
 
 namespace System.Web.Configuration
@@ -46,6 +47,7 @@
                }
 
                public CompilerCollection ()
+                       : base (CaseInsensitiveComparer.DefaultInvariant)
                {
                }
 
@@ -61,7 +63,7 @@
 
                public Compiler Get (string language)
                {
-                       return (Compiler) BaseGet (language);
+                       return this [language];
                }
 
                protected override object GetElementKey (ConfigurationElement 
element)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to