Skip to content

Commit e0e0741

Browse files
committed
Merge branch 'LongPollingLogicTweak' into AutoDetectLongPollingEnabledByDefault
2 parents 75b2c9b + ef8665f commit e0e0741

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

packages/firestore/src/lite-api/settings.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,17 @@ export class FirestoreSettingsImpl {
130130
settings.experimentalAutoDetectLongPolling
131131
);
132132

133-
if (!settings.experimentalForceLongPolling) {
134-
this.experimentalForceLongPolling = false;
135-
this.experimentalAutoDetectLongPolling =
136-
settings.experimentalAutoDetectLongPolling ?? true;
137-
} else {
133+
if (settings.experimentalForceLongPolling) {
138134
this.experimentalForceLongPolling = true;
139135
this.experimentalAutoDetectLongPolling = false;
136+
} else {
137+
this.experimentalForceLongPolling = false;
138+
if (settings.experimentalAutoDetectLongPolling === undefined) {
139+
this.experimentalAutoDetectLongPolling = true;
140+
} else {
141+
this.experimentalAutoDetectLongPolling =
142+
settings.experimentalAutoDetectLongPolling;
143+
}
140144
}
141145

142146
this.useFetchStreams = !!settings.useFetchStreams;

0 commit comments

Comments
 (0)