Skip to content

LANG-771 Fix DateUtils.ceiling increment on exact boundary #1609

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

Merged
garydgregory merged 3 commits into from
Feb 22, 2026
+23 −1
Merged

LANG-771 Fix DateUtils.ceiling increment on exact boundary #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80534a4
LANG-771 Fix DateUtils.ceiling increment on exact boundary
makarandhinge Feb 21, 2026
6266942
Fix Checkstyle violations for LANG-771
makarandhinge Feb 22, 2026
1aa1a17
LANG-771 Add edge case tests for DateUtils.ceiling()
makarandhinge Feb 22, 2026
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
4 changes: 3 additions & 1 deletion src/main/java/org/apache/commons/lang3/time/DateUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1115,6 +1115,8 @@ private static Calendar modify(final Calendar val, final int field, final Modify
return val;
}

final long originalMillis = val.getTimeInMillis();

// Fix for LANG-59 START
// see https://issues.apache.org/jira/browse/LANG-59
//
Expand Down Expand Up @@ -1161,7 +1163,7 @@ private static Calendar modify(final Calendar val, final int field, final Modify
for (final int element : aField) {
if (element == field) {
//This is our field... we stop looping
if (modType == ModifyType.CEILING || modType == ModifyType.ROUND && roundUp) {
if (modType == ModifyType.CEILING && originalMillis != val.getTimeInMillis() || modType == ModifyType.ROUND && roundUp) {
if (field == SEMI_MONTH) {
//This is a special case that's hard to generalize
//If the date is 1, we round up to 16, otherwise
Expand Down
20 changes: 20 additions & 0 deletions src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,7 @@ private static Stream<Arguments> testToLocalDateTimeTimeZone() {
private Date date6;
private Date date7;
private Date date8;
private Date date9;
private Calendar calAmPm1;
private Calendar calAmPm2;
private Calendar calAmPm3;
Expand Down Expand Up @@ -283,6 +284,7 @@ public void setUp() throws Exception {
dateTimeParser.setTimeZone(TIME_ZONE_DEFAULT);
TimeZone.setDefault(TIME_ZONE_DEFAULT);
}
date9 = dateTimeParser.parse("March 30, 2003 01:10:00.000");
calAmPm1 = Calendar.getInstance();
calAmPm1.setTime(dateAmPm1);
calAmPm2 = Calendar.getInstance();
Expand Down Expand Up @@ -530,6 +532,24 @@ void testCeiling() throws Exception {
assertEquals(dateTimeParser.parse("November 18, 2001 1:24:00.000"),
DateUtils.ceiling(date2, Calendar.MINUTE),
"ceiling minute-2 failed");
// Edge cases (LANG-771)
assertEquals(dateTimeParser.parse("March 30, 2003 01:10:00.000"),
DateUtils.ceiling(date9, Calendar.MINUTE),
"ceiling minute boundary failed");
final Date epoch = new Date(0);
assertEquals(epoch,
DateUtils.ceiling(epoch, Calendar.MINUTE),
"ceiling minute epoch failed");
final Date negative = new Date(-1);
assertEquals(new Date(0),
DateUtils.ceiling(negative, Calendar.MINUTE),
"ceiling minute negative failed");
assertThrows(ArithmeticException.class,
() -> DateUtils.ceiling(new Date(Long.MIN_VALUE), Calendar.MINUTE),
"ceiling minute Long.MIN_VALUE failed");
assertThrows(ArithmeticException.class,
() -> DateUtils.ceiling(new Date(Long.MAX_VALUE), Calendar.MINUTE),
"ceiling minute Long.MAX_VALUE failed");
assertEquals(dateTimeParser.parse("February 12, 2002 12:34:57.000"),
DateUtils.ceiling(date1, Calendar.SECOND),
"ceiling second-1 failed");
Expand Down