diff --git a/android/guava/src/com/google/common/io/BaseEncoding.java b/android/guava/src/com/google/common/io/BaseEncoding.java index 86a19493bbcf..9b64fb8c1c9b 100644 --- a/android/guava/src/com/google/common/io/BaseEncoding.java +++ b/android/guava/src/com/google/common/io/BaseEncoding.java @@ -28,6 +28,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Ascii; import com.google.common.base.Objects; +import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -831,8 +832,8 @@ public BaseEncoding withSeparator(String separator, int afterEveryChars) { return new SeparatedBaseEncoding(this, separator, afterEveryChars); } - @MonotonicNonNullDecl private transient BaseEncoding upperCase; - @MonotonicNonNullDecl private transient BaseEncoding lowerCase; + @LazyInit @MonotonicNonNullDecl private transient BaseEncoding upperCase; + @LazyInit @MonotonicNonNullDecl private transient BaseEncoding lowerCase; @Override public BaseEncoding upperCase() { diff --git a/guava/src/com/google/common/io/BaseEncoding.java b/guava/src/com/google/common/io/BaseEncoding.java index f3b3983169ab..408a21dd7b3a 100644 --- a/guava/src/com/google/common/io/BaseEncoding.java +++ b/guava/src/com/google/common/io/BaseEncoding.java @@ -28,6 +28,7 @@ import com.google.common.annotations.GwtIncompatible; import com.google.common.base.Ascii; import com.google.common.base.Objects; +import com.google.errorprone.annotations.concurrent.LazyInit; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -831,8 +832,8 @@ public BaseEncoding withSeparator(String separator, int afterEveryChars) { return new SeparatedBaseEncoding(this, separator, afterEveryChars); } - private transient @MonotonicNonNull BaseEncoding upperCase; - private transient @MonotonicNonNull BaseEncoding lowerCase; + @LazyInit @MonotonicNonNull private transient BaseEncoding upperCase; + @LazyInit @MonotonicNonNull private transient BaseEncoding lowerCase; @Override public BaseEncoding upperCase() {