2009-06-11 Marek Habersack <mhabersack@novell.com>

	* PageCompiler.cs: if generating code to assign output cache
	parameters, use special case for generating OutputCacheLocation
	enum reference. Fixes bug #512037

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

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index 3b6110b7723f7c837b43ecb05eb9fa51ed40d774..5d761d561656c85abbca20abe2f3954169b39019 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-11  Marek Habersack  <mhabersack@novell.com>
+
+       * PageCompiler.cs: if generating code to assign output cache
+       parameters, use special case for generating OutputCacheLocation
+       enum reference. Fixes bug #512037
+
 2009-06-04  Marek Habersack  <mhabersack@novell.com>
 
        * AspGenerator.cs: if plain text is parsed and it contains

diff --git a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
index 8de83541437b7e211e2d393e532186554442245f..2a4642e9ea53e2cc873ef5384d90a390756aa83a 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
@@ -408,7 +408,14 @@ namespace System.Web.Compilation
                        var ret = new CodeAssignStatement ();
 
                        ret.Left = new CodeFieldReferenceExpression (variable, propName);
-                       ret.Right = new CodePrimitiveExpression (value);
+
+                       if (value is OutputCacheLocation)
+                               ret.Right = new CodeFieldReferenceExpression (
+                                       new CodeTypeReferenceExpression (new CodeTypeReference (typeof (OutputCacheLocation), CodeTypeReferenceOptions.GlobalReference)),
+                                       value.ToString ()
+                               );
+                       else
+                               ret.Right = new CodePrimitiveExpression (value);
                        return ret;
                }