diff options
Diffstat (limited to 'android/guava/src/com/google/common/collect/NaturalOrdering.java')
-rw-r--r-- | android/guava/src/com/google/common/collect/NaturalOrdering.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/android/guava/src/com/google/common/collect/NaturalOrdering.java b/android/guava/src/com/google/common/collect/NaturalOrdering.java index 8cb8aef9a..dae531270 100644 --- a/android/guava/src/com/google/common/collect/NaturalOrdering.java +++ b/android/guava/src/com/google/common/collect/NaturalOrdering.java @@ -19,6 +19,7 @@ package com.google.common.collect; import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.annotations.GwtCompatible; +import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.Serializable; import javax.annotation.CheckForNull; import org.checkerframework.checker.nullness.qual.Nullable; @@ -30,8 +31,9 @@ import org.checkerframework.checker.nullness.qual.Nullable; final class NaturalOrdering extends Ordering<Comparable<?>> implements Serializable { static final NaturalOrdering INSTANCE = new NaturalOrdering(); - @CheckForNull private transient Ordering<@Nullable Comparable<?>> nullsFirst; - @CheckForNull private transient Ordering<@Nullable Comparable<?>> nullsLast; + // TODO: b/287198172 - Consider eagerly initializing these (but think about serialization). + @LazyInit @CheckForNull private transient Ordering<@Nullable Comparable<?>> nullsFirst; + @LazyInit @CheckForNull private transient Ordering<@Nullable Comparable<?>> nullsLast; @Override public int compare(Comparable<?> left, Comparable<?> right) { |