-Refactor

This commit is contained in:
James Newton-King
2015-06-15 16:54:13 +12:00
parent b85d56a52a
commit c496760a49
3 changed files with 7 additions and 9 deletions
@@ -58,6 +58,7 @@ namespace Newtonsoft.Json.Serialization
internal readonly JsonSerializer Serializer; internal readonly JsonSerializer Serializer;
internal readonly ITraceWriter TraceWriter; internal readonly ITraceWriter TraceWriter;
protected JsonSerializerProxy InternalSerializer;
protected JsonSerializerInternalBase(JsonSerializer serializer) protected JsonSerializerInternalBase(JsonSerializer serializer)
{ {
@@ -57,8 +57,6 @@ namespace Newtonsoft.Json.Serialization
Value = 2 Value = 2
} }
private JsonSerializerProxy _internalSerializer;
public JsonSerializerInternalReader(JsonSerializer serializer) public JsonSerializerInternalReader(JsonSerializer serializer)
: base(serializer) : base(serializer)
{ {
@@ -184,10 +182,10 @@ namespace Newtonsoft.Json.Serialization
private JsonSerializerProxy GetInternalSerializer() private JsonSerializerProxy GetInternalSerializer()
{ {
if (_internalSerializer == null) if (InternalSerializer == null)
_internalSerializer = new JsonSerializerProxy(this); InternalSerializer = new JsonSerializerProxy(this);
return _internalSerializer; return InternalSerializer;
} }
private JToken CreateJToken(JsonReader reader, JsonContract contract) private JToken CreateJToken(JsonReader reader, JsonContract contract)
@@ -51,7 +51,6 @@ namespace Newtonsoft.Json.Serialization
private JsonContract _rootContract; private JsonContract _rootContract;
private int _rootLevel; private int _rootLevel;
private readonly List<object> _serializeStack = new List<object>(); private readonly List<object> _serializeStack = new List<object>();
private JsonSerializerProxy _internalSerializer;
public JsonSerializerInternalWriter(JsonSerializer serializer) public JsonSerializerInternalWriter(JsonSerializer serializer)
: base(serializer) : base(serializer)
@@ -104,10 +103,10 @@ namespace Newtonsoft.Json.Serialization
private JsonSerializerProxy GetInternalSerializer() private JsonSerializerProxy GetInternalSerializer()
{ {
if (_internalSerializer == null) if (InternalSerializer == null)
_internalSerializer = new JsonSerializerProxy(this); InternalSerializer = new JsonSerializerProxy(this);
return _internalSerializer; return InternalSerializer;
} }
private JsonContract GetContractSafe(object value) private JsonContract GetContractSafe(object value)