Skip to content

Fix race condition when fieldValueCache is null #903

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wilhuff merged 1 commit into from
Oct 14, 2019
Merged

Fix race condition when fieldValueCache is null #903

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions firebase-firestore/src/main/java/com/google/firebase/firestore/model/Document.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,12 @@ public ObjectValue getData() {
} else {
hardAssert(proto != null && converter != null, "Expected proto and converter to be non-null");

Map<FieldPath, FieldValue> fieldValueCache = this.fieldValueCache;
if (fieldValueCache == null) {
// TODO(b/136090445): Remove the cache when `getField` is no longer called during Query
// ordering.
fieldValueCache = new ConcurrentHashMap<>();
this.fieldValueCache = fieldValueCache;
}

FieldValue fieldValue = fieldValueCache.get(path);
Expand Down