2010-05-05 Marek Habersack <mhabersack@novell.com>

	* CollectionBuilder.cs: if a type has more than on indexer, check
	all of them for type compliance in GetChildControlType. Fixes bug
	#601290. Patch from Kalyanov Dmitry <Kalyanov.Dmitry@gmail.com>,
	thanks!

svn path=/trunk/mcs/; revision=156714

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 75dcd56deda2fe04ba3d0e09ab4ecce1e3185c65..86b9c444dbc4fd9943a60b1b5a6b74c30a2a7c3b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,10 @@
+2010-05-05  Marek Habersack  <mhabersack@novell.com>
+
+       * CollectionBuilder.cs: if a type has more than on indexer, check
+       all of them for type compliance in GetChildControlType. Fixes bug
+       #601290. Patch from Kalyanov Dmitry <Kalyanov.Dmitry@gmail.com>,
+       thanks!
+
 2010-04-28  Marek Habersack  <mhabersack@novell.com>
 
        * KeyedList.cs: do not implement IStateManager in 4.0

diff --git a/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs b/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
index 00076d55ea0b68920cbaf6b3b738755f3a366793..9f9a9f49528f765e08d596a3983cafc924221bc8 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
@@ -31,12 +31,13 @@
 using System;
 using System.Collections;
 using System.Reflection;
+using System.Text;
 
 namespace System.Web.UI
 {
        sealed class CollectionBuilder : ControlBuilder
        {
-               Type elementType;
+               Type[] possibleElementTypes;
 
                internal CollectionBuilder ()
                {
@@ -51,8 +52,21 @@ namespace System.Web.UI
                public override Type GetChildControlType (string tagName, IDictionary attribs)
                {
                        Type t = Root.GetChildControlType (tagName, attribs);
-                       if (elementType != null && !elementType.IsAssignableFrom (t)) 
-                               throw new HttpException ("Cannot add a " + t + " to " + elementType);
+                       if (possibleElementTypes != null) {
+                               bool foundMatchingType = false;
+                               for (int i = 0; i < possibleElementTypes.Length && !foundMatchingType; ++i)
+                                       foundMatchingType = possibleElementTypes[i].IsAssignableFrom (t);
+                               
+                               if (!foundMatchingType) {
+                                       StringBuilder possibleTypesString = new StringBuilder ();
+                                       for (int i = 0; i < possibleElementTypes.Length; i++) {
+                                               if (i != 0)
+                                                       possibleTypesString.Append (", ");
+                                               possibleTypesString.Append (possibleElementTypes[i]);
+                                       }
+                                       throw new HttpException ("Cannot add a " + t + " to " + possibleTypesString);
+                               }
+                       }
 
                        return t;
                }
@@ -70,12 +84,12 @@ namespace System.Web.UI
                        SetControlType (prop.PropertyType);
 
                        MemberInfo[] mems = ControlType.GetMember ("Item", MemberTypes.Property, FlagsNoCase & ~BindingFlags.IgnoreCase);
-                       if (mems.Length > 0)
-                               prop = (PropertyInfo) mems [0];
-                       else
+                       if (mems.Length > 0) {
+                               possibleElementTypes = new Type [mems.Length];
+                               for (int i = 0; i < mems.Length; ++i)
+                                       possibleElementTypes [i] = ((PropertyInfo)mems [i]).PropertyType;
+                       } else
                                throw new HttpException ("Collection of type '" + ControlType + "' does not have an indexer.");
-                       
-                       elementType = prop.PropertyType;
                }
        }
 }