-Fixed deserializing empty strings in Hashtables
This commit is contained in:
@@ -1556,6 +1556,19 @@ namespace Newtonsoft.Json.Tests.Serialization
|
|||||||
]", json);
|
]", json);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
public void EmptyStringInHashtableIsDeserialized()
|
||||||
|
{
|
||||||
|
string externalJson = @"{""$type"":""System.Collections.Hashtable, mscorlib"",""testkey"":""""}";
|
||||||
|
|
||||||
|
JsonSerializerSettings settings = new JsonSerializerSettings { TypeNameHandling = TypeNameHandling.All };
|
||||||
|
|
||||||
|
JsonConvert.SerializeObject(new Hashtable { { "testkey", "" } }, settings);
|
||||||
|
Hashtable deserializeTest2 = JsonConvert.DeserializeObject<Hashtable>(externalJson, settings);
|
||||||
|
|
||||||
|
Assert.AreEqual(deserializeTest2["testkey"], "");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !(NET40 || NET35 || NET20 || PORTABLE40)
|
#if !(NET40 || NET35 || NET20 || PORTABLE40)
|
||||||
|
|||||||
@@ -279,7 +279,7 @@ namespace Newtonsoft.Json.Serialization
|
|||||||
string s = (string)reader.Value;
|
string s = (string)reader.Value;
|
||||||
|
|
||||||
// convert empty string to null automatically for nullable types
|
// convert empty string to null automatically for nullable types
|
||||||
if (string.IsNullOrEmpty(s) && objectType != typeof(string) && objectType != typeof(object) && contract != null && contract.IsNullable)
|
if (string.IsNullOrEmpty(s) && objectType != null && objectType != typeof(string) && objectType != typeof(object) && contract != null && contract.IsNullable)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
// string that needs to be returned as a byte array should be base 64 decoded
|
// string that needs to be returned as a byte array should be base 64 decoded
|
||||||
|
|||||||
Reference in New Issue
Block a user