-Fixed MetadataHandling.ReadAhead bugs

This commit is contained in:
James Newton-King
2014-07-20 12:26:00 +12:00
parent 6b5356ed51
commit 07baae515a
8 changed files with 163 additions and 6 deletions
+15 -1
View File
@@ -504,7 +504,21 @@ namespace Newtonsoft.Json
if (t == JsonToken.String)
{
string s = (string)Value;
byte[] data = (s.Length == 0) ? new byte[0] : Convert.FromBase64String(s);
if (s.Length == 0)
return new byte[0];
byte[] data;
Guid g;
if (ConvertUtils.TryConvertGuid(s, out g))
{
data = g.ToByteArray();
SetToken(JsonToken.Bytes, data, false);
return data;
}
data = Convert.FromBase64String(s);
SetToken(JsonToken.Bytes, data, false);
return data;
}