In JsonReader, replaced SimpleDateFormat with DatatypeConverter.parseDateTime, as Java 6 does not support the 'X' pattern character.

 JAVA-1768

Author: jyemin

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

@@ -875,18 +875,12 @@ private long visitDateTimeExtendedJson() {
         if (valueToken.getType() == JsonTokenType.INT32 || valueToken.getType() == JsonTokenType.INT64) {
             return valueToken.getValue(Long.class);
         } else if (valueToken.getType() == JsonTokenType.STRING) {
-            String dateString = valueToken.getValue(String.class);
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ENGLISH);
-            ParsePosition pos = new ParsePosition(0);
-            format.setLenient(true);
-
-            Date date = format.parse(dateString, pos);
-
-            if (date != null && pos.getIndex() == dateString.length()) {
-                return date.getTime();
+            String dateTimeString = valueToken.getValue(String.class);
+            try {
+                return DatatypeConverter.parseDateTime(dateTimeString).getTimeInMillis();
+            } catch (IllegalArgumentException e) {
+                throw new JsonParseException("JSON reader expected an ISO-8601 date time string but found.", dateTimeString);
             }
-
-            throw new JsonParseException("JSON reader expected an ISO-8601 date string but found.", dateString);
         } else {
             throw new JsonParseException("JSON reader expected an integer or string but found '%s'.", valueToken.getValue());
         }

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

@@ -147,7 +147,7 @@ public void testDateTimeISOStringWithTimeOffset() {
 
     @Test(expected = JsonParseException.class)
     public void testInvalidDateTimeISOString1() {
-        String json = "{ \"$date\" : \"2015-04-16T16:55:57.626+02:000\" }";
+        String json = "{ \"$date\" : \"2015-04-16T16:55:57.626+02:0000\" }";
         bsonReader = new JsonReader(json);
         bsonReader.readBsonType();
     }