Fixed UTF8 preambles in reporting.

1 files changed, 7 insertions, 2 deletions

diff --git a/src/DotNetOpenAuth/Reporting.cs b/src/DotNetOpenAuth/Reporting.cs
index 612845f..9f104fe 100644
--- a/src/DotNetOpenAuth/Reporting.cs
+++ b/src/DotNetOpenAuth/Reporting.cs
@@ -107,6 +107,11 @@ namespace DotNetOpenAuth {
 		private static DateTime lastPublished = DateTime.Now;
 
 		/// <summary>
+		/// A UTF8 encoder that doesn't emit the preamble.  Used for mid-stream writers.
+		/// </summary>
+		private static readonly Encoding Utf8NoPreamble = new UTF8Encoding(false);
+
+		/// <summary>
 		/// Initializes static members of the <see cref="Reporting"/> class.
 		/// </summary>
 		[SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline", Justification = "We do more than field initialization here.")]
@@ -665,7 +670,7 @@ namespace DotNetOpenAuth {
 					this.memorySet.Add(this.reader.ReadLine());
 				}
 
-				this.writer = new StreamWriter(this.fileStream, Encoding.UTF8);
+				this.writer = new StreamWriter(this.fileStream, Utf8NoPreamble);
 				this.lastFlushed = DateTime.Now;
 			}
 
@@ -818,7 +823,7 @@ namespace DotNetOpenAuth {
 					}
 				}
 
-				this.writer = new StreamWriter(this.fileStream, Encoding.UTF8);
+				this.writer = new StreamWriter(this.fileStream, Utf8NoPreamble);
 				this.lastFlushed = DateTime.Now;
 			}