Skip to content

Fix correctly report COLLECTED removal cause in compute() #8070

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

Closed
wants to merge 1 commit into from
+11 −1
Closed

Fix correctly report COLLECTED removal cause in compute() #8070

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
12 changes: 11 additions & 1 deletion guava/src/com/google/common/cache/LocalCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
* @author Charles Fry
* @author Bob Lee ({@code com.google.common.collect.MapMaker})
* @author Doug Lea ({@code ConcurrentHashMap})
* @author Ko Su
*/
@SuppressWarnings({
"GoodTime", // lots of violations (nanosecond math)
Expand Down Expand Up @@ -2287,7 +2288,16 @@ V waitForLoadingValue(ReferenceEntry<K, V> e, K key, ValueReference<K, V> valueR
removeLoadingValue(key, hash, computingValueReference);
return null;
} else {
removeEntry(e, hash, RemovalCause.EXPLICIT);
V oldValue = valueReference.get();

RemovalCause cause;
if (oldValue == null && valueReference.isActive()) {
cause = RemovalCause.COLLECTED;
} else {
cause = RemovalCause.EXPLICIT;
}

removeEntry(e, hash, cause);
return null;
}
} finally {
Expand Down