Author: mhabersack
Date: 2008-02-04 12:57:32 -0500 (Mon, 04 Feb 2008)
New Revision: 94771

Modified:
   branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
   branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/ChangeLog
Log:
Backport of r94770



Modified: 
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
===================================================================
--- 
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs   
    2008-02-04 17:54:07 UTC (rev 94770)
+++ 
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs   
    2008-02-04 17:57:32 UTC (rev 94771)
@@ -259,6 +259,7 @@
 
                public void Parse (string file)
                {
+                       isApplication = tparser.DefaultDirectiveName == 
"application";
 #if ONLY_1_1
                        InitParser (file);
 #endif
@@ -333,7 +334,6 @@
                                return type;
                        }
 
-                       isApplication = tparser.DefaultDirectiveName == 
"application";
                        Parse ();
 
                        BaseCompiler compiler = GetCompilerFromType ();

Modified: 
branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/ChangeLog
===================================================================
--- branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/ChangeLog     
2008-02-04 17:54:07 UTC (rev 94770)
+++ branches/mono-1-9/mcs/class/System.Web/System.Web.Compilation/ChangeLog     
2008-02-04 17:57:32 UTC (rev 94771)
@@ -1,3 +1,8 @@
+2008-02-04  Marek Habersack  <[EMAIL PROTECTED]>
+
+       * AspGenerator.cs: set isApplication before parsing. Fixes bug
+       #357036.
+
 2008-01-31  Jb Evain  <[EMAIL PROTECTED]>
 
        * AspGenerator.cs: correct typo. Fix #357547.

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to