Merge pull request #2781 from alexanderkyte/inflated_method_header_leak

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / ContentControlBuilderInternal.cs

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilderInternal.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilderInternal.cs
index e72f2a5e056ccae5194dd7ee510676599367897e..40200b53e71c146247056479aa51b14507632441 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilderInternal.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ContentControlBuilderInternal.cs
@@ -4,7 +4,7 @@
 // Authors:
 //   Lluis Sanchez Gual (lluis@novell.com)
 //
-// (C) 2005 Novell, Inc.
+// (C) 2005-2010 Novell, Inc.
 //
 
 //
@@ -28,8 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
-
 using System;
 using System.Collections;
 using System.Web.UI.WebControls;
@@ -40,15 +38,13 @@ namespace System.Web.UI.WebControls
        {
                string placeHolderID;
                
-               public override void Init (TemplateParser parser,
-                                         ControlBuilder parentBuilder,
-                                         Type type,
-                                         string tagName,
-                                         string ID,
-                                         IDictionary attribs)
+               public override void Init (TemplateParser parser, ControlBuilder parentBuilder, Type type,
+                                          string tagName, string ID, IDictionary attribs)
                {
                        base.Init (parser, parentBuilder, type, tagName, ID, attribs);
                        placeHolderID = attribs ["ContentPlaceHolderID"] as string;
+                       if (String.IsNullOrEmpty (placeHolderID))
+                               throw new HttpException ("Missing required 'ContentPlaceHolderID' attribute");
                }
                
                public string ContentPlaceHolderID {
@@ -57,4 +53,3 @@ namespace System.Web.UI.WebControls
        }
 }
 
-#endif