LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1131 from JonHanna/opt_extensions_values

Browse Source 
Optimise Extensions.Values
This commit is contained in:
James Newton-King
2017-01-05 16:58:12 +13:00
committed by GitHub
parent 008a3c7655 4db6579593
commit 5bd69fe8be
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Src/Newtonsoft.Json/Linq/Extensions.cs
+9 -7
View File
@@ -184,13 +184,14 @@ namespace Newtonsoft.Json.Linq
{ {
ValidationUtils.ArgumentNotNull(source, nameof(source)); ValidationUtils.ArgumentNotNull(source, nameof(source));
foreach (JToken token in source) if (key == null)
{ {
if (key == null) foreach (T token in source)
{ {
if (token is JValue) JValue value = token as JValue;
if (value != null)
{ {
yield return Convert<JValue, U>((JValue)token); yield return Convert<JValue, U>(value);
} }
else else
{ {
@@ -200,7 +201,10 @@ namespace Newtonsoft.Json.Linq
} }
} }
} }
else }
else
{
foreach (T token in source)
{ {
JToken value = token[key]; JToken value = token[key];
if (value != null) if (value != null)
@@ -209,8 +213,6 @@ namespace Newtonsoft.Json.Linq
} }
} }
} }
yield break;
} }
//TODO //TODO