diff options
| author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2024-01-03 17:28:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-03 17:28:59 +0000 |
| commit | 0be00b5218b69852777cab76ff89457211904bc9 (patch) | |
| tree | cbc7e4894708533a0ddc4e61da1d74e64393e0e1 /android/guava/src/com/google/common/collect/EnumHashBiMap.java | |
| parent | eec82bd5ace8fd2c4ba647f153c4c03e1bb41268 (diff) | |
| parent | fcb68273955c94ebe12fda34018935b0c25d56dc (diff) | |
| download | guava-0be00b5218b69852777cab76ff89457211904bc9.tar.gz | |
Merge "Upgrade guava to v33.0.0" into main am: fcb6827395
Original change: https://android-review.googlesource.com/c/platform/external/guava/+/2894060
Change-Id: I59ee73835cab1c252c9a5e630e9b1afcd5c76417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android/guava/src/com/google/common/collect/EnumHashBiMap.java')
| -rw-r--r-- | android/guava/src/com/google/common/collect/EnumHashBiMap.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android/guava/src/com/google/common/collect/EnumHashBiMap.java b/android/guava/src/com/google/common/collect/EnumHashBiMap.java index 33b45b95c..c7432d404 100644 --- a/android/guava/src/com/google/common/collect/EnumHashBiMap.java +++ b/android/guava/src/com/google/common/collect/EnumHashBiMap.java @@ -17,6 +17,7 @@ package com.google.common.collect; import static com.google.common.base.Preconditions.checkNotNull; +import static java.util.Objects.requireNonNull; import com.google.common.annotations.GwtCompatible; import com.google.common.annotations.GwtIncompatible; @@ -128,7 +129,7 @@ public final class EnumHashBiMap<K extends Enum<K>, V extends @Nullable Object> @GwtIncompatible // java.io.ObjectInputStream private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException { stream.defaultReadObject(); - keyTypeOrObjectUnderJ2cl = (Class<K>) stream.readObject(); + keyTypeOrObjectUnderJ2cl = (Class<K>) requireNonNull(stream.readObject()); /* * TODO: cpovirk - Pre-size the HashMap based on the number of enum values? (But *not* based on * the number of entries in the map, as that makes it easy for hostile inputs to trigger lots of |