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

	* TemplateControl.cs: if writer is null in
	WriteUTF8ResourceString, use output.Write, not writer.Write. Fixes
	bug #547015

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

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index 75f03546f39c57e4274c83c7426a4ec452072928..11f3576b698172a308f87b0c1b575f91f4df9570 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,9 @@
+2009-11-14  Marek Habersack  <mhabersack@novell.com>
+
+       * TemplateControl.cs: if writer is null in
+       WriteUTF8ResourceString, use output.Write, not writer.Write. Fixes
+       bug #547015
+
 2009-11-10  Marek Habersack  <mhabersack@novell.com>
 
        * TemplateParser.cs: AddImports is called from LoadConfigDefaults

diff --git a/mcs/class/System.Web/System.Web.UI/TemplateControl.cs b/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
index 5804de26e91fa6f9e8c8084edae5676ffb9edaa1..63503e86da575e464dbd0ac6b89a7656b4dac05d 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
+++ b/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
@@ -486,10 +486,11 @@ namespace System.Web.UI {
                        //TODO: fAsciiOnly?
                        IntPtr ptr = AddOffset (resource_data.Ptr, offset);
                        HttpWriter writer = output.GetHttpWriter ();
+                       
                        if (writer == null || writer.Response.ContentEncoding.CodePage != 65001) {
                                byte [] bytes = new byte [size];
                                Marshal.Copy (ptr, bytes, 0, size);
-                               writer.Write (Encoding.UTF8.GetString (bytes));
+                               output.Write (Encoding.UTF8.GetString (bytes));
                                bytes = null;
                                return;
                        }