-JsonTextReader, BsonReader performance

-Fix dictionary key encoding when serializing
-Fix WrappedDictionary being set to a property when deserializing
-Fix Silverlight serialization security error
This commit is contained in:
JamesNK
2010-01-01 23:13:35 +00:00
parent 974178a162
commit 324c4e4bc5
25 changed files with 971 additions and 566 deletions
+10 -2
View File
@@ -288,7 +288,15 @@ namespace Newtonsoft.Json
public override void WriteValue(string value)
{
base.WriteValue(value);
WriteValueInternal((value != null) ? JsonConvert.ToString(value, _quoteChar) : JsonConvert.Null, JsonToken.String);
if (value == null)
WriteValueInternal(JsonConvert.Null, JsonToken.Null);
else
{
JavaScriptUtils.WriteEscapedJavaScriptString(_writer, value, _quoteChar, true);
//_writer.Write(JavaScriptUtils.EscapeJavaScriptString(value, _quoteChar, false));
//WriteValueInternal(, JsonToken.String);
//JavaScriptUtils.WriteEscapedJavaScriptString(_writer, value, _quoteChar, true);
}
}
/// <summary>
@@ -428,7 +436,7 @@ namespace Newtonsoft.Json
public override void WriteValue(DateTime value)
{
base.WriteValue(value);
WriteValueInternal(JsonConvert.ToString(value), JsonToken.Date);
JsonConvert.WriteDateTimeString(_writer, value);
}
/// <summary>