archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8310241: OffsetDateTime compareTo redundant computation

Browse source 
Reviewed-by: naoto
This commit is contained in:
Roger Riggs 2023-06-29 21:05:37 +00:00
parent d97966266e
commit 11fd34e196
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/java.base/share/classes/java/time/OffsetDateTime.java
View file

@ -1805,7 +1805,13 @@ public final class OffsetDateTime
*/ */
@Override @Override
public int compareTo(OffsetDateTime other) { public int compareTo(OffsetDateTime other) {
int cmp = compareInstant(this, other); int cmp = getOffset().compareTo(other.getOffset());
if (cmp != 0) {
cmp = Long.compare(toEpochSecond(), other.toEpochSecond());
if (cmp == 0) {
cmp = toLocalTime().getNano() - other.toLocalTime().getNano();
}
}
if (cmp == 0) { if (cmp == 0) {
cmp = toLocalDateTime().compareTo(other.toLocalDateTime()); cmp = toLocalDateTime().compareTo(other.toLocalDateTime());
} }

3
test/jdk/java/time/tck/java/time/TCKOffsetDateTime.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -1381,6 +1381,7 @@ public class TCKOffsetDateTime extends AbstractDateTimeTest {
assertEquals(a.compareTo(a) == 0, true); assertEquals(a.compareTo(a) == 0, true);
assertEquals(b.compareTo(b) == 0, true); assertEquals(b.compareTo(b) == 0, true);
assertEquals(a.toInstant().compareTo(b.toInstant()) == 0, true); assertEquals(a.toInstant().compareTo(b.toInstant()) == 0, true);
assertEquals(OffsetDateTime.timeLineOrder().compare(a,b) == 0, true);
} }
@Test @Test