Merge pull request #1500 from criteo-forks/criteo

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

diff --git a/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs b/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs
index f9c49f0bdf13d72622f40a126543bad43c53030f..fbd974056ddba8685493a155040c4f925e5c1cd5 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs
+++ b/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs
@@ -24,21 +24,18 @@
 // Authors:
 //     Jackson Harper (jackson@ximian.com)
 //
-// (C) 2005 Novell, Inc.
+// Copyright (C) 2005-2010 Novell, Inc (http://www.novell.com)
 
-using System;
 using System.Reflection;
 using System.ComponentModel;
+using System.Security.Permissions;
 
 namespace System.Web.UI {
 
-       public sealed class PropertyConverter {
-
-               private PropertyConverter ()
-               {
-                       // no instantiation for you
-               }
-
+       // CAS - no InheritanceDemand here as the class is sealed
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       public static class PropertyConverter
+       {
                public static object EnumFromString (Type enumType, string value)
                {
                        object res = null;