Merge pull request #841 from quickfix-j/leapsecond

check for leapsecond in `UTCTimestampConverter`

Author: chrjohn

quickfixj-base/src/main/java/quickfix/field/converter/UtcTimestampConverter.java

@@ -151,6 +151,10 @@ public static LocalDateTime convertToLocalDateTime(String value) throws FieldCon
         int h = parseInt(value, 9, 2);
         int m = parseInt(value, 12, 2);
         int s = parseInt(value, 15, 2);
+        if (s == 60) {  // leap second
+            s = 59;
+            ns = 999999999;
+        }
         try {
             return LocalDateTime.of(yy, mm, dd, h, m, s, ns);
         } catch (DateTimeException e) {

quickfixj-base/src/test/java/quickfix/FieldConvertersTest.java

@@ -586,4 +586,24 @@ public void shouldFailToConvertFromStringToCharArrayWhenNoCharactersPresent() th
 
         CharArrayConverter.convert("");
     }
+
+    @Test
+    public void testConvertToLocalDateTimeLeapSecond() throws Exception {
+        LocalDateTime dateTime = UtcTimestampConverter.convertToLocalDateTime("19981231-23:59:60");
+        assertLocalDateTimeFieldsLeapSecond(dateTime);
+        
+        dateTime = UtcTimestampConverter.convertToLocalDateTime("19981231-23:59:60.123456789012");
+        assertLocalDateTimeFieldsLeapSecond(dateTime);
+    }
+
+    private void assertLocalDateTimeFieldsLeapSecond(LocalDateTime dateTime) {
+        assertEquals(23, dateTime.getHour());
+        assertEquals(59, dateTime.getMinute());
+        assertEquals(59, dateTime.getSecond());
+        assertEquals(1998, dateTime.getYear());
+        assertEquals(12, dateTime.getMonthValue());
+        assertEquals(31, dateTime.getDayOfMonth());
+        assertEquals(999999999, dateTime.getNano());
+    }
+
 }

quickfixj-base/src/test/java/quickfix/FieldMapTest.java

@@ -6,8 +6,6 @@
 import static org.junit.Assert.assertTrue;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.util.Iterator;
 import java.util.Optional;