Skip to content

Changed referenceKeyMap entry value type to CopyOnWriteArrayList #15258

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
AlbumenJ merged 1 commit into from
May 7, 2025
Merged

Changed referenceKeyMap entry value type to CopyOnWriteArrayList #15258

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
17 changes: 8 additions & 9 deletions ...g-spring/src/main/java/org/apache/dubbo/config/spring/reference/ReferenceBeanManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.apache.dubbo.config.spring.util.DubboBeanUtils;
import org.apache.dubbo.rpc.model.ModuleModel;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
Expand All @@ -35,6 +34,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;

import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
Expand All @@ -47,7 +47,7 @@ public class ReferenceBeanManager implements ApplicationContextAware {
private final ErrorTypeAwareLogger logger = LoggerFactory.getErrorTypeAwareLogger(getClass());

// reference key -> reference bean names
private ConcurrentMap<String, List<String>> referenceKeyMap = new ConcurrentHashMap<>();
private ConcurrentMap<String, CopyOnWriteArrayList<String>> referenceKeyMap = new ConcurrentHashMap<>();

// reference alias -> reference bean name
private ConcurrentMap<String, String> referenceAliasMap = new ConcurrentHashMap<>();
Expand Down Expand Up @@ -102,8 +102,8 @@ public void addReference(ReferenceBean referenceBean) throws Exception {
}

private String getReferenceKeyByBeanName(String referenceBeanName) {
Set<Map.Entry<String, List<String>>> entries = referenceKeyMap.entrySet();
for (Map.Entry<String, List<String>> entry : entries) {
Set<Map.Entry<String, CopyOnWriteArrayList<String>>> entries = referenceKeyMap.entrySet();
for (Map.Entry<String, CopyOnWriteArrayList<String>> entry : entries) {
if (entry.getValue().contains(referenceBeanName)) {
return entry.getKey();
}
Expand All @@ -112,10 +112,9 @@ private String getReferenceKeyByBeanName(String referenceBeanName) {
}

public void registerReferenceKeyAndBeanName(String referenceKey, String referenceBeanNameOrAlias) {
List<String> list =
ConcurrentHashMapUtils.computeIfAbsent(referenceKeyMap, referenceKey, (key) -> new ArrayList<>());
if (!list.contains(referenceBeanNameOrAlias)) {
list.add(referenceBeanNameOrAlias);
CopyOnWriteArrayList<String> list = ConcurrentHashMapUtils.computeIfAbsent(
referenceKeyMap, referenceKey, (key) -> new CopyOnWriteArrayList<>());
if (list.addIfAbsent(referenceBeanNameOrAlias)) {
// register bean name as alias
referenceAliasMap.put(referenceBeanNameOrAlias, list.get(0));
}
Expand All @@ -132,7 +131,7 @@ private String transformName(String referenceBeanNameOrAlias) {
}

public List<String> getBeanNamesByKey(String key) {
return Collections.unmodifiableList(referenceKeyMap.getOrDefault(key, Collections.EMPTY_LIST));
return Collections.unmodifiableList(referenceKeyMap.getOrDefault(key, new CopyOnWriteArrayList<>()));
}

public Collection<ReferenceBean> getReferences() {
Expand Down
Loading