Merge ifs into following switch on same expression in ReadAsBytes (#1147)

This commit is contained in:
Jon Hanna
2017-01-09 14:01:18 +13:00
committed by James Newton-King
parent 859d12e338
commit ec2659e3ad
+3 -8
View File
@@ -510,12 +510,9 @@ namespace Newtonsoft.Json
{ {
JsonToken t = GetContentToken(); JsonToken t = GetContentToken();
if (t == JsonToken.None) switch (t)
{ {
return null; case JsonToken.StartObject:
}
if (TokenType == JsonToken.StartObject)
{ {
ReadIntoWrappedTypeObject(); ReadIntoWrappedTypeObject();
@@ -530,9 +527,6 @@ namespace Newtonsoft.Json
SetToken(JsonToken.Bytes, data, false); SetToken(JsonToken.Bytes, data, false);
return data; return data;
} }
switch (t)
{
case JsonToken.String: case JsonToken.String:
{ {
// attempt to convert possible base 64 or GUID string to bytes // attempt to convert possible base 64 or GUID string to bytes
@@ -558,6 +552,7 @@ namespace Newtonsoft.Json
SetToken(JsonToken.Bytes, data, false); SetToken(JsonToken.Bytes, data, false);
return data; return data;
} }
case JsonToken.None:
case JsonToken.Null: case JsonToken.Null:
case JsonToken.EndArray: case JsonToken.EndArray:
return null; return null;