Merge "Merge commit '2dc111d' from 'stabilization-f69489' into 'master'"
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DateTimeFormatUtils.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DateTimeFormatUtils.java
index 98abb97..5e8ee90 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DateTimeFormatUtils.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/base/temporal/DateTimeFormatUtils.java
@@ -585,6 +585,13 @@
                     } else if (processState == DateTimeProcessState.SECOND) {
                         sec = parsedValue;
                     } else if (processState == DateTimeProcessState.MILLISECOND) {
+                        //read remaining millis values
+                        while (dataStringPointer < dataLength && data[dataStart + dataStringPointer] >= '0'
+                                && data[dataStart + dataStringPointer] <= '9') {
+                            //parsedValue = parsedValue * 10 + (data[dataStart + dataStringPointer] - '0');
+                            dataStringPointer++;
+                            processFieldsCount++;
+                        }
                         ms = parsedValue;
                         for (int i = processFieldsCount; i < 3; i++) {
                             ms *= 10;