From 0a76ba8ed9567617759f8a2a1fd8d43b4cd546bc Mon Sep 17 00:00:00 2001
From: cpovirk <cpovirk@google.com>
Date: Mon, 1 Jul 2024 06:59:11 -0700
Subject: [PATCH] Tweak code to avoid upsetting the nullness checker.

There are other ways to accomplish this, such as (I think) going back to the local variable that was present until cl/643464920. Let me know if you have a preference.

RELNOTES=n/a
PiperOrigin-RevId: 648355140
---
 .../src/com/google/common/collect/ImmutableMultimap.java     | 5 +++--
 guava/src/com/google/common/collect/ImmutableMultimap.java   | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/android/guava/src/com/google/common/collect/ImmutableMultimap.java b/android/guava/src/com/google/common/collect/ImmutableMultimap.java
index 2782a006c8fa..8f9b908b13b4 100644
--- a/android/guava/src/com/google/common/collect/ImmutableMultimap.java
+++ b/android/guava/src/com/google/common/collect/ImmutableMultimap.java
@@ -177,7 +177,8 @@ public Builder<K, V> put(K key, V value) {
       checkEntryNotNull(key, value);
       ImmutableCollection.Builder<V> valuesBuilder = ensureBuilderMapNonNull().get(key);
       if (valuesBuilder == null) {
-        builderMap.put(key, valuesBuilder = newValueCollectionBuilder());
+        valuesBuilder = newValueCollectionBuilder();
+        ensureBuilderMapNonNull().put(key, valuesBuilder);
       }
       valuesBuilder.add(value);
       return this;
@@ -224,7 +225,7 @@ public Builder<K, V> putAll(K key, Iterable<? extends V> values) {
       ImmutableCollection.Builder<V> valuesBuilder = ensureBuilderMapNonNull().get(key);
       if (valuesBuilder == null) {
         valuesBuilder = newValueCollectionBuilder();
-        builderMap.put(key, valuesBuilder);
+        ensureBuilderMapNonNull().put(key, valuesBuilder);
       }
       while (valuesItr.hasNext()) {
         V value = valuesItr.next();
diff --git a/guava/src/com/google/common/collect/ImmutableMultimap.java b/guava/src/com/google/common/collect/ImmutableMultimap.java
index 835c4dd9feaa..983974c0a80c 100644
--- a/guava/src/com/google/common/collect/ImmutableMultimap.java
+++ b/guava/src/com/google/common/collect/ImmutableMultimap.java
@@ -179,7 +179,8 @@ public Builder<K, V> put(K key, V value) {
       checkEntryNotNull(key, value);
       ImmutableCollection.Builder<V> valuesBuilder = ensureBuilderMapNonNull().get(key);
       if (valuesBuilder == null) {
-        builderMap.put(key, valuesBuilder = newValueCollectionBuilder());
+        valuesBuilder = newValueCollectionBuilder();
+        ensureBuilderMapNonNull().put(key, valuesBuilder);
       }
       valuesBuilder.add(value);
       return this;
@@ -226,7 +227,7 @@ public Builder<K, V> putAll(K key, Iterable<? extends V> values) {
       ImmutableCollection.Builder<V> valuesBuilder = ensureBuilderMapNonNull().get(key);
       if (valuesBuilder == null) {
         valuesBuilder = newValueCollectionBuilder();
-        builderMap.put(key, valuesBuilder);
+        ensureBuilderMapNonNull().put(key, valuesBuilder);
       }
       while (valuesItr.hasNext()) {
         V value = valuesItr.next();