2009-11-14 Marek Habersack <[email protected]>

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

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

mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,3 +1,9 @@
+2009-11-14  Marek Habersack  <[email protected]>
+
+	* TemplateControl.cs: if writer is null in
+	WriteUTF8ResourceString, use output.Write, not writer.Write. Fixes
+	bug #547015
+
 2009-11-10  Marek Habersack  <[email protected]>
 
 	* TemplateParser.cs: AddImports is called from LoadConfigDefaults

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;
 			}