-Added MetadataPropertyHandling.Ignore

This commit is contained in:
James Newton-King
2014-07-20 18:29:31 +12:00
parent 07baae515a
commit e32b4671c8
5 changed files with 180 additions and 15 deletions
+9 -7
View File
@@ -505,20 +505,22 @@ namespace Newtonsoft.Json
{
string s = (string)Value;
if (s.Length == 0)
return new byte[0];
byte[] data;
Guid g;
if (ConvertUtils.TryConvertGuid(s, out g))
if (s.Length == 0)
{
data = new byte[0];
}
else if (ConvertUtils.TryConvertGuid(s, out g))
{
data = g.ToByteArray();
SetToken(JsonToken.Bytes, data, false);
return data;
}
else
{
data = Convert.FromBase64String(s);
}
data = Convert.FromBase64String(s);
SetToken(JsonToken.Bytes, data, false);
return data;
}