JAVA-2500: Ensure that JsonReader.visitDateTimeExtendedJson always consumes the END_OBJECT token

Author: jyemin

bson/src/main/org/bson/json/JsonReader.java

@@ -984,7 +984,7 @@ private long visitDateTimeExtendedJson() {
             verifyToken(JsonTokenType.END_OBJECT);
         } else {
             if (valueToken.getType() == JsonTokenType.INT32 || valueToken.getType() == JsonTokenType.INT64) {
-                return valueToken.getValue(Long.class);
+                value = valueToken.getValue(Long.class);
             } else if (valueToken.getType() == JsonTokenType.STRING) {
                 String dateTimeString = valueToken.getValue(String.class);
                 try {

bson/src/test/unit/org/bson/json/JsonReaderTest.java

@@ -146,6 +146,16 @@ public void testDateTimeStrict() {
         assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
     }
 
+    @Test
+    public void testNestedDateTimeStrict() {
+        String json = "{d1 : { \"$date\" : 0 }, d2 : { \"$date\" : 1 } }";
+        bsonReader = new JsonReader(json);
+        bsonReader.readStartDocument();
+        assertEquals(0L, bsonReader.readDateTime("d1"));
+        assertEquals(1L, bsonReader.readDateTime("d2"));
+        bsonReader.readEndDocument();
+    }
+
     @Test
     public void testDateTimeISOString() {
         String json = "{ \"$date\" : \"2015-04-16T14:55:57.626Z\" }";