From: Gonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Date: Wed, 26 Mar 2003 16:34:54 +0000 (-0000)
Subject: 2003-03-26  Gonzalo Paniagua Javier <gonzalo@ximian.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=a4b711d2739d1fcba98d303e2a499ff1f90933de;p=mono.git

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 b35e12b3d1d..3f186dee5eb 100644
--- 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 93e336ec30f..9553b06c98b 100644
--- 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: