Skip to content

Commit 27088ad

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

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.text.ParseException;
2020
import java.text.ParsePosition;
21+
import java.time.Instant;
2122
import java.time.LocalDateTime;
2223
import java.time.ZoneId;
2324
import java.util.Calendar;
@@ -1647,7 +1648,8 @@ public static LocalDateTime toLocalDateTime(final Date date) {
16471648
* @since 3.18
16481649
*/
16491650
public static LocalDateTime toLocalDateTime(final Date date, final TimeZone tz) {
1650-
return Objects.requireNonNull(date, "date").toInstant().atZone(ZoneId.of(tz.getID())).toLocalDateTime();
1651+
return LocalDateTime.ofInstant(Instant.ofEpochMilli(Objects.requireNonNull(date, "date").getTime()),
1652+
Objects.requireNonNull(tz,"tz").toZoneId());
16511653
}
16521654

16531655
/**

0 commit comments

Comments
 (0)