Skip to content
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

8273369: Computing micros between two instants unexpectedly overflows for some cases #5396

Closed
wants to merge 6 commits into from
+52 −6
Closed

8273369: Computing micros between two instants unexpectedly overflows for some cases #5396

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09d9b25
8273369: Computing micros between two instants unexpectedly overflows…
naotoj Sep 7, 2021
4b874ff
Added a constant for nanos per micro.
naotoj Sep 7, 2021
7d567e8
Corrected the constant.
naotoj Sep 7, 2021
bbd6abc
Moved the constant to LocalTime for consistency.
naotoj Sep 7, 2021
ccf73bf
Added comments for the test.
naotoj Sep 8, 2021
1f6fd47
Corrected the calculation for MILLIS as well.
naotoj Sep 8, 2021
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
6 changes: 5 additions & 1 deletion src/java.base/share/classes/java/time/Instant.java
View file
Original file line number Diff line number Diff line change
@@ -242,6 +242,10 @@ public final class Instant
* an {@code int}.
*/
public static final Instant MAX = Instant.ofEpochSecond(MAX_SECOND, 999_999_999);
/**
* Nanos per micro.
*/
private static final long NANOS_PER_MICRO = 1_000L;

/**
* Serialization version.
@@ -1166,7 +1170,7 @@ private long nanosUntil(Instant end) {

private long microsUntil(Instant end) {
long secsDiff = Math.subtractExact(end.seconds, seconds);
long totalMicros = Math.multiplyExact(secsDiff, NANOS_PER_SECOND / 1000);
long totalMicros = Math.multiplyExact(secsDiff, NANOS_PER_MICRO);
return Math.addExact(totalMicros, (end.nanos - nanos) / 1000);
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you define NANOS_PER_MICRO, the others conversions use predefined constants.

Copy link
Member Author

Choose a reason for hiding this comment

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

Defined it as a private field in Instant.

}