From c496760a49932ef4b66468b2c34f69aaa704ed1b Mon Sep 17 00:00:00 2001 From: James Newton-King Date: Mon, 15 Jun 2015 16:54:13 +1200 Subject: [PATCH] -Refactor --- .../Serialization/JsonSerializerInternalBase.cs | 1 + .../Serialization/JsonSerializerInternalReader.cs | 8 +++----- .../Serialization/JsonSerializerInternalWriter.cs | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalBase.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalBase.cs index da378710..096a5792 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalBase.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalBase.cs @@ -58,6 +58,7 @@ namespace Newtonsoft.Json.Serialization internal readonly JsonSerializer Serializer; internal readonly ITraceWriter TraceWriter; + protected JsonSerializerProxy InternalSerializer; protected JsonSerializerInternalBase(JsonSerializer serializer) { diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs index bf5c2426..778e5a46 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalReader.cs @@ -57,8 +57,6 @@ namespace Newtonsoft.Json.Serialization Value = 2 } - private JsonSerializerProxy _internalSerializer; - public JsonSerializerInternalReader(JsonSerializer serializer) : base(serializer) { @@ -184,10 +182,10 @@ namespace Newtonsoft.Json.Serialization private JsonSerializerProxy GetInternalSerializer() { - if (_internalSerializer == null) - _internalSerializer = new JsonSerializerProxy(this); + if (InternalSerializer == null) + InternalSerializer = new JsonSerializerProxy(this); - return _internalSerializer; + return InternalSerializer; } private JToken CreateJToken(JsonReader reader, JsonContract contract) diff --git a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs index 960fd72e..b22d03ce 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonSerializerInternalWriter.cs @@ -51,7 +51,6 @@ namespace Newtonsoft.Json.Serialization private JsonContract _rootContract; private int _rootLevel; private readonly List _serializeStack = new List(); - private JsonSerializerProxy _internalSerializer; public JsonSerializerInternalWriter(JsonSerializer serializer) : base(serializer) @@ -104,10 +103,10 @@ namespace Newtonsoft.Json.Serialization private JsonSerializerProxy GetInternalSerializer() { - if (_internalSerializer == null) - _internalSerializer = new JsonSerializerProxy(this); + if (InternalSerializer == null) + InternalSerializer = new JsonSerializerProxy(this); - return _internalSerializer; + return InternalSerializer; } private JsonContract GetContractSafe(object value)