2009-03-06 Marek Habersack <[email protected]>

	* ControlBuilder.cs: BindingContainerType - if control type of the
	containing builder is null, return typeof (Control)

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

mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,3 +1,8 @@
+2009-03-06  Marek Habersack  <[email protected]>
+
+	* ControlBuilder.cs: BindingContainerType - if control type of the
+	containing builder is null, return typeof (Control)
+
 2009-03-03  Rodrigo Kumpera  <[email protected]>
 
 	* Control.cs (FillControlCache): Remove useless control

mcs/class/System.Web/System.Web.UI/ControlBuilder.cs

@@ -268,6 +268,9 @@ namespace System.Web.UI {
 						return ct;
 
 					ct = cb.ControlType;
+					if (ct == null)
+						return typeof (Control);
+					
 					if (typeof (INonBindingContainer).IsAssignableFrom (ct) || !typeof (INamingContainer).IsAssignableFrom (ct))
 						return MyNamingContainer.BindingContainerType;
 
@@ -275,6 +278,9 @@ namespace System.Web.UI {
 				}
 
 				ct = cb.ControlType;
+				if (ct == null)
+					return typeof (Control);
+				
 				if (typeof (INonBindingContainer).IsAssignableFrom (ct) || !typeof (INamingContainer).IsAssignableFrom (ct))
 					return MyNamingContainer.BindingContainerType;