This commit introduces a few 4.0 rendering changes which break some tests. The...

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

diff --git a/mcs/class/System.Web/System.Web.UI/ObjectTagBuilder.cs b/mcs/class/System.Web/System.Web.UI/ObjectTagBuilder.cs
index 3a815d6a291db310c8c2f43a7ed673c7de53c836..b02765bcf7e909ef60778e364be0eef884167864 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ObjectTagBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/ObjectTagBuilder.cs
@@ -5,7 +5,7 @@
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2003 Ximian, Inc. (http://www.ximian.com)
-
+// Copyright (C) 2005 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
@@ -27,13 +27,14 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-
-using System;
 using System.Collections;
+using System.Security.Permissions;
 using System.Web.Compilation;
 
 namespace System.Web.UI
 {
+       // CAS - no InheritanceDemand here as the class is sealed
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
        public sealed class ObjectTagBuilder : ControlBuilder
        {
                string id;
@@ -62,6 +63,8 @@ namespace System.Web.UI
                                           string id,
                                           IDictionary attribs) 
                {
+                       if (id == null && attribs == null)
+                               throw new HttpException ("Missing 'id'.");
                        if (attribs == null)
                                throw new ParseException (parser.Location, "Error in ObjectTag.");