Skip to content

Commit 4d69373

Browse files
committed
Manually convert date to Instant to avoid exceptions caused by incompatible subclasses (such as java.sql.Date).
1 parent 07fb413 commit 4d69373

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/main/java/org/apache/commons/lang3/time/DateUtils.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import java.text.ParseException;
2020
import java.text.ParsePosition;
21+
import java.time.Instant;
2122
import java.time.LocalDateTime;
22-
import java.time.ZoneId;
2323
import java.util.Calendar;
2424
import java.util.Date;
2525
import java.util.Iterator;
@@ -1647,7 +1647,8 @@ public static LocalDateTime toLocalDateTime(final Date date) {
16471647
* @since 3.18
16481648
*/
16491649
public static LocalDateTime toLocalDateTime(final Date date, final TimeZone tz) {
1650-
return Objects.requireNonNull(date, "date").toInstant().atZone(ZoneId.of(tz.getID())).toLocalDateTime();
1650+
return LocalDateTime.ofInstant(Instant.ofEpochMilli(Objects.requireNonNull(date, "date").getTime()),
1651+
Objects.requireNonNull(tz,"tz").toZoneId());
16511652
}
16521653

16531654
/**

0 commit comments

Comments
 (0)