chore(firestore): clean up the code for checking if instance exists (#…

…13576)
firebase · Oct 31, 2024 · 9335436 · 9335436
1 parent 9e80c1d
commit 9335436
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...main/java/io/flutter/plugins/firebase/firestore/FlutterFirebaseFirestoreMessageCodec.java b/...main/java/io/flutter/plugins/firebase/firestore/FlutterFirebaseFirestoreMessageCodec.java
@@ -290,11 +290,11 @@ private FirebaseFirestore readFirestoreInstance(ByteBuffer buffer) {
     String databaseURL = (String) readValue(buffer);
     FirebaseFirestoreSettings settings = (FirebaseFirestoreSettings) readValue(buffer);
     synchronized (FlutterFirebaseFirestorePlugin.firestoreInstanceCache) {
-      if (FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
-              appName, databaseURL)
-          != null) {
-        return FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
-            appName, databaseURL);
+      FirebaseFirestore cachedFirestoreInstance =
+          FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
+              appName, databaseURL);
+      if (cachedFirestoreInstance != null) {
+        return cachedFirestoreInstance;
       }
 
       FirebaseApp app = FirebaseApp.getInstance(appName);

diff --git a/...d/src/main/java/io/flutter/plugins/firebase/firestore/FlutterFirebaseFirestorePlugin.java b/...d/src/main/java/io/flutter/plugins/firebase/firestore/FlutterFirebaseFirestorePlugin.java
@@ -309,11 +309,11 @@ static FirebaseFirestoreSettings getSettingsFromPigeon(
   public static FirebaseFirestore getFirestoreFromPigeon(
       GeneratedAndroidFirebaseFirestore.FirestorePigeonFirebaseApp pigeonApp) {
     synchronized (FlutterFirebaseFirestorePlugin.firestoreInstanceCache) {
-      if (FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
-              pigeonApp.getAppName(), pigeonApp.getDatabaseURL())
-          != null) {
-        return FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
-            pigeonApp.getAppName(), pigeonApp.getDatabaseURL());
+      FirebaseFirestore cachedFirestoreInstance =
+          FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
+              pigeonApp.getAppName(), pigeonApp.getDatabaseURL());
+      if (cachedFirestoreInstance != null) {
+        return cachedFirestoreInstance;
       }
 
       FirebaseApp app = FirebaseApp.getInstance(pigeonApp.getAppName());