Skip to content

Floor pre-epoch Timestamp seconds in DateTimeConverter.convertToType #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rootvector2 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −1
Open

Floor pre-epoch Timestamp seconds in DateTimeConverter.convertToType #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/beanutils2/converters/DateTimeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ protected <T> T convertToType(final Class<T> targetType, final Object value) thr
// didn't include the milliseconds. The following code
// ensures it works consistently across JDK versions
final java.sql.Timestamp timestamp = (java.sql.Timestamp) value;
long timeInMillis = timestamp.getTime() / 1000 * 1000;
long timeInMillis = Math.floorDiv(timestamp.getTime(), 1000) * 1000;
timeInMillis += timestamp.getNanos() / 1000000;
return toDate(targetType, timeInMillis);
Comment on lines +203 to 205

@garydgregory garydgregory Aug 8, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @rootvector2
Please review Copiolot's comment. The comment suggests we are also missing a unit tests for the path Copilot found. Please verify and provide an additional test.
Thank you!

}
Expand Down
17 changes: 17 additions & 0 deletions src/test/java/org/apache/commons/beanutils2/converters/DateConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@

package org.apache.commons.beanutils2.converters;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Date;

import org.junit.jupiter.api.Test;

/**
* Test Case for the DateConverter class.
*/
Expand Down Expand Up @@ -66,4 +71,16 @@ protected DateConverter makeConverter(final Date defaultValue) {
protected Date toType(final Calendar value) {
return value.getTime();
}

/**
* A pre-epoch {@link Timestamp} carries a non-negative sub-second part in {@code getNanos()}, so decomposing
* {@code getTime()} into whole seconds must floor: integer division truncates toward zero for negative values and
* gains a whole second.
*/
@Test
void testConvertPreEpochSqlTimestamp() {
// 1969-12-31T23:59:59.500Z: getTime() == -500, getNanos() == 500_000_000
final Timestamp timestamp = new Timestamp(-500L);
assertEquals(-500L, makeConverter().convert(getExpectedType(), timestamp).getTime());
}
}
Loading