2003-03-26 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* AspGenerator.cs: now the Inherits attribute works as expected for
	global.asax file.

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

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
index b35e12b3d1d69e28757f0f593881dfee50a5b256..3f186dee5eb0753ce17dc6546f6bdf86063a8dfd 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
@@ -725,8 +725,12 @@ class AspGenerator
                                throw new ApplicationException ("@Application not allowed.");
 
                        string inherits = att ["inherits"] as string;
-                       if (inherits != null)
-                               Options ["Inherits"] = inherits;
+                       if (inherits != null) {
+                               parent = inherits;
+                               parentType = LoadParentType (parent);
+                               if (parentType == null)
+                                       throw new ApplicationException ("The class " + parent + " cannot be found.");
+                       }
 
                        main_directive = directive.TagID;
                        break;

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index 93e336ec30f4420bd8ae13fff20269056fc5bed9..9553b06c98b2e69a3b4975c8029606a91f1f0379 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-26  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * AspGenerator.cs: now the Inherits attribute works as expected for
+       global.asax file.
+
 2003-03-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * CompilationException.cs: