Commit Graph
1621 Commits
Author SHA1 Message Date
Jon Hanna 1b40ebfe26 Apply fix to #1460 to async writing. (#1540)
* Apply fix to #1460 to async writing.

* Replace recursion with iteration.

* Test for 1460 in async use.

* Change infinite loop style.
2017-12-20 16:06:07 +13:00
Mark Pflug 3ea750d6d6 Performance optimization for integer value serialization. (#1544)
* Performance optimization for integer serialization.

* Add int32 overloads for integer formatter.

* fix parameter name

* Prefer using the faster, 32 bit division code path, when possible.

* fix code formatting

* fix uint range check, add test coverage
2017-12-20 11:08:09 +13:00
Jon Hanna a8245a5b9e Use cancellationToken in two places it was missed. (#1539)
I'm not sure if this was a simple slip up, or if I was thinking of
skipping the check for speed reasons when I did this, but as these
two calls can both often happen at as the first actual write to stream,
which can have the longest delay waiting for the underlying layer,
they should both have the opportunity to cancel.
2017-12-17 08:25:43 +13:00
James Newton-King fde0fef06f -Build 2017-12-15 15:27:01 +13:00
Jon Hanna cc084e1127 Spelling fix asychronousity → asynchronicity (#1538) 2017-12-15 08:22:21 +13:00
James Newton-King 90514188c0 -Test 2017-12-05 14:25:15 +13:00
James Newton-King d0d01f2a36 -Fixed merging null string values 2017-12-04 18:53:50 +13:00
James Newton-King 977884d779 -Test 2017-11-29 17:02:25 +13:00
James Newton-King a6d1351c4c -Build 2017-11-26 13:31:27 +13:00
James Newton-King efb4f3d64f -Build 2017-11-26 13:22:30 +13:00
James Newton-King 2c9d9b9598 -Updated NuGet packages
-Fixed xunit warnings
2017-11-26 13:00:07 +13:00
James Newton-King df3c1caef2 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2017-11-26 10:13:36 +13:00
James Newton-King a138852994 -Changed JObject.ContainsKey to public 2017-11-26 10:13:13 +13:00
James Newton-King 60f66d9c96 -Changed version to 11.0.1 2017-11-17 18:23:31 +13:00
James Newton-King f19418f9e3 -Badges 2017-11-13 20:11:42 +13:00
James Newton-King 9138c140ec -Badges 2017-11-13 20:10:34 +13:00
Ben Adams b55b315f53 Badges? 2017-11-11 16:19:56 +00:00
James Newton-King af5bedaed0 -Build 2017-11-08 16:42:23 +13:00
James Newton-King fcd5975cd9 -Added ItemNullValueHandling to JsonObjectContract 2017-11-08 16:32:42 +13:00
James Newton-King 08ea72b72b Merge branch 'issue/1429' of https://github.com/paulirwin/Newtonsoft.Json into paulirwin-issue/1429 2017-11-08 14:52:07 +13:00
James Newton-King 1584588f03 -Missing file header 2017-11-08 09:59:51 +13:00
James Newton-King 48be21d4ce -Changed ISerializable serialization to require SerializableAttribute 2017-11-04 17:53:17 +13:00
Paul Irwin 28405e7309 Per discussion on #1429, rename NullValueHandling to ItemNullValueHandling 2017-11-02 11:22:27 -04:00
Paul Irwin 6129124507 For #1429, respect unset initial value on JsonObjectAttribute 2017-11-02 11:01:34 -04:00
Paul Irwin 7d44b61c32 Resolve #1429 for JsonObjectAttribute only: add NullValueHandling property 2017-11-02 10:55:08 -04:00
James Newton-King 1e612287b3 -Documentation 2017-10-27 13:21:52 +13:00
James Newton-King 8c0fa58708 Merge branch 'patch-1' of https://github.com/ekevoo/Newtonsoft.Json into ekevoo-patch-1 2017-10-27 13:18:46 +13:00
James Newton-King f012ba857f -Derp 2017-10-23 12:25:38 +13:00
James Newton-King 3154a6de68 -Refactor 2017-10-23 12:24:52 +13:00
James Newton-King 473a7721bd -Refactor 2017-10-23 10:33:35 +13:00
James Newton-King 9932155295 -Refactor to expression body properties 2017-10-23 09:49:12 +13:00
James Newton-King ef18269626 -Refactor 2017-10-23 09:34:05 +13:00
James Newton-King be032b562e -Documentation 2017-10-22 23:25:15 +13:00
James Newton-King 72d517ea04 Merge branch 'master' of https://github.com/sebasrp/Newtonsoft.Json into sebasrp-master 2017-10-22 22:31:07 +13:00
James Newton-King 90976eb6ed -Fixed error when writing unknown null value as JSON 2017-10-22 19:26:57 +13:00
James Newton-King a8e606dcf5 Merge branch 'master' of https://github.com/JamesNK/Newtonsoft.Json 2017-10-22 17:48:49 +13:00
James Newton-King 4494e523d5 -Test 2017-10-22 17:48:28 +13:00
Kristof Mattei 122afba990 Updated StringUtils.ToCamelCase to fix an edge case. (#1467) 2017-10-22 17:10:03 +13:00
James Newton-King 4a74cf1b1a -Fixed deserializing with constructor and readonly collection property 2017-10-22 13:03:33 +13:00
James Newton-King 12f886ab99 -Test
-Minor refactor
2017-10-19 23:54:19 +13:00
James Newton-King 3eabd15a19 -Test 2017-10-16 19:39:21 +13:00
James Newton-King 78e899fd50 -Refactor
-Tests
2017-10-15 18:51:12 +13:00
James Newton-King 393c456d5e Merge branch 'patch-1' of https://github.com/Romasz/Newtonsoft.Json into Romasz-patch-1 2017-10-15 11:31:48 +13:00
James Newton-King 64f6fd7b39 -Fixed TraceJsonWriter.WriteValue(object) writing value twice 2017-10-14 14:21:39 +13:00
James Newton-King 8dd5eff2ee -Minor refactor 2017-10-14 12:18:10 +13:00
James Newton-King 5829826cbb -Minor refactor 2017-10-14 11:14:39 +13:00
Tomasz Romaszkiewicz 6330ea5d14 Added Unit test and allowed GC large objects. 2017-10-07 14:01:04 +02:00
Tomasz Romaszkiewicz 17f055e944 Update JsonTextReader.cs
We are doubling the _chars.Length when calculation newArrayLength, thus it's worth to check if we are not out of int.MaxValue.
This fix allows to work on bigger files.
2017-10-06 19:47:30 +02:00
James Newton-King 6057d9b831 -Fixed deserializing with a TraceWriter when the reader is not at the start 2017-10-06 19:11:34 +13:00
Sebastian Rodriguez 1fc00d2ec7 add JsonSerializerSettings defaults documentation. See issue #1245 2017-10-02 22:19:27 +01:00