Merge pull request #1131 from JonHanna/opt_extensions_values

Optimise Extensions.Values
2017-01-05 16:58:12 +13:00
parent 008a3c7655 4db6579593
commit 5bd69fe8be
1 changed files with 9 additions and 7 deletions
@@ -184,13 +184,14 @@ namespace Newtonsoft.Json.Linq
        {
            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
                    {
@@ -200,7 +201,10 @@ namespace Newtonsoft.Json.Linq
                        }
                    }
                }
-                else
+            }
+            else
+            {
+                foreach (T token in source)
                {
                    JToken value = token[key];
                    if (value != null)
@@ -209,8 +213,6 @@ namespace Newtonsoft.Json.Linq
                    }
                }
            }
-
-            yield break;
        }

        //TODO