From 0546ded7194ae0a80137fd4c0315a26e2c35b65e Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Mon, 18 Jul 2016 21:38:45 +1200 Subject: [PATCH] -Fixed using a TraceWriter with nullable bytes --- .../Serialization/TraceWriterTests.cs | 15 +++++++++++++++ .../Serialization/TraceJsonWriter.cs | 7 ------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs b/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs index 8dcaad3d..2689434d 100644 --- a/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs +++ b/Src/Newtonsoft.Json.Tests/Serialization/TraceWriterTests.cs @@ -77,6 +77,21 @@ Newtonsoft.Json Error: 0 : Error! } #endif + [Test] + public void WriteNullableByte() + { + StringWriter sw = new StringWriter(); + TraceJsonWriter traceJsonWriter = new TraceJsonWriter(new JsonTextWriter(sw)); + traceJsonWriter.WriteStartArray(); + traceJsonWriter.WriteValue((byte?)null); + traceJsonWriter.WriteEndArray(); + + StringAssert.AreEqual(@"Serialized JSON: +[ + null +]", traceJsonWriter.GetSerializedJsonMessage()); + } + [Test] public void WriteJRaw() { diff --git a/Src/Newtonsoft.Json/Serialization/TraceJsonWriter.cs b/Src/Newtonsoft.Json/Serialization/TraceJsonWriter.cs index 0d384342..f943d06f 100644 --- a/Src/Newtonsoft.Json/Serialization/TraceJsonWriter.cs +++ b/Src/Newtonsoft.Json/Serialization/TraceJsonWriter.cs @@ -58,13 +58,6 @@ namespace Newtonsoft.Json.Serialization base.WriteValue(value); } - public override void WriteValue(byte? value) - { - _textWriter.WriteValue(value); - _innerWriter.WriteValue(value); - base.WriteValue(value); - } - public override void WriteValue(char value) { _textWriter.WriteValue(value);