Merge branch 'users/askagarw/RegionsContacted' of https://github.com/…

…Azure/azure-cosmos-dotnet-v3 into users/askagarw/RegionsContacted
Azure · Mar 16, 2021 · 97dd07d · 97dd07d
2 parents 0ea080a + 8999c75
commit 97dd07d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Microsoft.Azure.Cosmos/src/Spatial/Converters/GeometryJsonConverter.cs b/Microsoft.Azure.Cosmos/src/Spatial/Converters/GeometryJsonConverter.cs
@@ -61,7 +61,8 @@ public override object ReadJson(
  }
 
  JToken typeToken = token["type"];
- if (typeToken.Type != JTokenType.String)
+ if (typeToken == null 
+ || typeToken.Type != JTokenType.String)
  {
  throw new JsonSerializationException(RMResources.SpatialInvalidGeometryType);
  }

diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Spatial/CommonSerializationTest.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/Spatial/CommonSerializationTest.cs
@@ -29,6 +29,17 @@ public void TestInvalidJson()
  Point point = JsonConvert.DeserializeObject<Point>(json);
  }
 
+ /// <summary>
+ /// Tests that no type throws exception.
+ /// </summary>
+ [TestMethod]
+ [ExpectedException(typeof(JsonSerializationException))]
+ public void TestNoType()
+ {
+ string json = @"{""notatype"":""nothingrelevant""}";
+ Point point = JsonConvert.DeserializeObject<Point>(json);
+ }
+
  /// <summary>
  /// Tests that coordinates cannot be null.
  /// </summary>