Skip to content

Avoid lock congestion in ConcurrentReferenceHashMap #36293

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
jhoeller merged 1 commit into from
Feb 11, 2026
+12 −0
Merged

Avoid lock congestion in ConcurrentReferenceHashMap #36293

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: 12 additions & 0 deletions spring-core/src/main/java/org/springframework/util/ConcurrentReferenceHashMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,12 @@ protected Boolean execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> e

@Override
public @Nullable V computeIfAbsent(@Nullable K key, Function<@Nullable ? super K, @Nullable ? extends V> mappingFunction) {
// avoid locking if entry is present
Reference<K, V> ref = getReference(key, Restructure.NEVER);
Entry<K, V> entry = (ref != null ? ref.get() : null);
if (entry != null) {
return entry.getValue();
}
return doTask(key, new Task<V>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.RESIZE) {
@Override
protected @Nullable V execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry, @Nullable Entries<V> entries) {
Expand All @@ -390,6 +396,12 @@ protected Boolean execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> e

@Override
public @Nullable V computeIfPresent(@Nullable K key, BiFunction<@Nullable ? super K, @Nullable ? super V, @Nullable ? extends V> remappingFunction) {
// avoid locking if entry is absent
Reference<K, V> ref = getReference(key, Restructure.NEVER);
Entry<K, V> entry = (ref != null ? ref.get() : null);
if (entry == null) {
return null;
}
return doTask(key, new Task<V>(TaskOption.RESTRUCTURE_BEFORE, TaskOption.RESIZE) {
@Override
protected @Nullable V execute(@Nullable Reference<K, V> ref, @Nullable Entry<K, V> entry, @Nullable Entries<V> entries) {
Expand Down
Loading