Skip to content

Use computeIfAbsent() replace putIfAbsent() #1402

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

Open
zhanghailang123 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Use computeIfAbsent() replace putIfAbsent() #1402

Show file tree
Hide file tree
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
9 changes: 3 additions & 6 deletions ...ters/threadpool/server/src/main/java/cn/hippo4j/springboot/starter/core/ClientWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,9 +276,7 @@ public CacheData addCacheDataIfAbsent(String namespace, String itemId, String th
if (cacheData != null) {
return cacheData;
}
cacheData = new CacheData(namespace, itemId, threadPoolId);
CacheData lastCacheData = cacheMap.putIfAbsent(threadPoolId, cacheData);
if (lastCacheData == null) {
return cacheMap.computeIfAbsent(threadPoolId, k-> {
String serverConfig;
try {
serverConfig = getServerConfig(namespace, itemId, threadPoolId, defaultTimedOut);
Expand All @@ -287,9 +285,8 @@ public CacheData addCacheDataIfAbsent(String namespace, String itemId, String th
} catch (Exception ex) {
log.error("Cache Data Error. Service Unavailable: {}", ex.getMessage());
}
lastCacheData = cacheData;
}
return lastCacheData;
return cacheData;
});
}

private void setHealthServer(boolean isHealthServer) {
Expand Down
9 changes: 4 additions & 5 deletions ...adpool/server/discovery/src/main/java/cn/hippo4j/discovery/core/BaseInstanceRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,10 @@ public List<Lease<InstanceInfo>> listInstance(String appName) {
public void register(InstanceInfo registrant) {
Map<String, Lease<InstanceInfo>> registerMap = registry.get(registrant.getAppName());
if (registerMap == null) {
ConcurrentHashMap<String, Lease<InstanceInfo>> registerNewMap = new ConcurrentHashMap<>();
registerMap = registry.putIfAbsent(registrant.getAppName(), registerNewMap);
if (registerMap == null) {
registerMap = registerNewMap;
}
registerMap = registry.computeIfAbsent(registrant.getAppName(), k -> {
ConcurrentHashMap<String, Lease<InstanceInfo>> registerNewMap = new ConcurrentHashMap<>();
return registerNewMap;
});
}
Lease<InstanceInfo> existingLease = registerMap.get(registrant.getInstanceId());
if (existingLease != null && (existingLease.getHolder() != null)) {
Expand Down