Merge pull request #224 from sgnr/master

Fix a bug where certain JSON path expressions would spuriously fail.
2014-03-15 11:09:28 +13:00
parent d684913966 28062b9cbb
commit abeea50c97
2 changed files with 11 additions and 2 deletions
@@ -272,6 +272,16 @@ namespace Newtonsoft.Json.Tests.Linq.JsonPath
                () => { o.SelectToken("Missing", true); });
        }

+        [Test]
+        public void EvaluatePropertyWithoutError()
+        {
+            JObject o = new JObject(
+                new JProperty("Blah", 1));
+
+            JValue v = (JValue)o.SelectToken("Blah", true);
+            Assert.AreEqual(1L, v.Value);
+        }
+
        [Test]
        public void EvaluateMissingPropertyIndexWithError()
        {
@@ -21,8 +21,7 @@ namespace Newtonsoft.Json.Linq.JsonPath

                        if (v != null)
                            yield return v;
-
-                        if (errorWhenNoMatch)
+                        else if (errorWhenNoMatch)
                            throw new JsonException("Property '{0}' does not exist on JObject.".FormatWith(CultureInfo.InvariantCulture, Name));
                    }
                    else