Skip to content
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

Use more specific ConcurrentMap methods #2188

Merged
merged 1 commit into from
Apr 13, 2022
Merged

Use more specific ConcurrentMap methods #2188

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
8 changes: 5 additions & 3 deletions servicetalk-client-api/src/main/java/io/servicetalk/client/api/DefaultClientGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,17 +123,19 @@ public Client get(final Key key) {
try {
client = requireNonNull(clientFactory.apply(key), "Newly created client can not be null");
} catch (Throwable t) {
clientMap.remove(key); // PLACEHOLDER_CLIENT
final boolean removed = clientMap.remove(key, PLACEHOLDER_CLIENT);
assert removed : "Expected to remove PLACEHOLDER_CLIENT";
throw new IllegalArgumentException("Failed to create new client", t);
}

clientMap.put(key, client); // Overwrite PLACEHOLDER_CLIENT
final boolean replaced = clientMap.replace(key, PLACEHOLDER_CLIENT, client);
assert replaced : "Expected to replace PLACEHOLDER_CLIENT";
toSource(client.onClose()).subscribe(new RemoveClientOnClose(key, client));
LOGGER.debug("A new client {} was created", client);

if (closed) {
// group has been closed after a new client was created
if (clientMap.remove(key) != null) { // not closed by closing thread
if (clientMap.remove(key, client)) { // not closed by closing thread
client.closeAsync().subscribe();
LOGGER.debug("Recently created client {} was removed and closed, group {} closed", client, this);
}
Expand Down