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

	* AspGenerator.cs: fix mapping of our tag types into
	CodeConstructType. Fixes bug #508570

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

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
index dfb95b9e1800f020303916cd3bdb34543ee50e8b..dcbd5b631ce78c4aaa5097b4a0cc48c2c701d2db 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
+++ b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
@@ -1259,13 +1259,13 @@ namespace System.Web.Compilation
                CodeConstructType MapTagTypeToConstructType (TagType tagtype)
                {
                        switch (tagtype) {
-                               case TagType.DataBinding:
+                               case TagType.CodeRenderExpression:
                                        return CodeConstructType.ExpressionSnippet;
 
                                case TagType.CodeRender:
                                        return CodeConstructType.CodeSnippet;
 
-                               case TagType.CodeRenderExpression:
+                               case TagType.DataBinding:
                                        return CodeConstructType.DataBindingSnippet;
 
                                default:

diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
index 98983343b293a42c0c87def21ec2ef2cb9686c60..9877bbe561ef1e577afde8d26fbaa348209db108 100644 (file)
--- a/mcs/class/System.Web/System.Web.Compilation/ChangeLog
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-01  Marek Habersack  <mhabersack@novell.com>
+
+       * AspGenerator.cs: fix mapping of our tag types into
+       CodeConstructType. Fixes bug #508570
+
 2009-05-26  Marek Habersack  <mhabersack@novell.com>
 
        * AspGenerator.cs: before including a file specified with the