Skip to content

fixing clean up method in client - missing synchronization #425

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
merged 1 commit into from
Oct 12, 2017
Merged

fixing clean up method in client - missing synchronization #425

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
43 changes: 27 additions & 16 deletions rsocket-core/src/main/java/io/rsocket/RSocketClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,18 @@

package io.rsocket;

import static io.rsocket.util.ExceptionUtil.noStacktrace;

import io.netty.buffer.Unpooled;
import io.netty.util.collection.IntObjectHashMap;
import io.rsocket.exceptions.ConnectionException;
import io.rsocket.exceptions.Exceptions;
import io.rsocket.internal.LimitableRequestPublisher;
import io.rsocket.util.PayloadImpl;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import reactor.core.Disposable;
import reactor.core.publisher.*;

import javax.annotation.Nullable;
import java.nio.channels.ClosedChannelException;
import java.time.Duration;
import java.util.Collection;
Expand All @@ -32,11 +36,8 @@
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.function.Supplier;
import javax.annotation.Nullable;
import org.reactivestreams.Publisher;
import org.reactivestreams.Subscriber;
import reactor.core.Disposable;
import reactor.core.publisher.*;

import static io.rsocket.util.ExceptionUtil.noStacktrace;

/** Client Side of a RSocket socket. Sends {@link Frame}s to a {@link RSocketServer} */
class RSocketClient implements RSocket {
Expand Down Expand Up @@ -419,29 +420,39 @@ private boolean contains(int streamId) {
}

protected void cleanup() {
senders.forEach(
(integer, limitableRequestPublisher) ->
cleanUpLimitableRequestPublisher(limitableRequestPublisher));

receivers.forEach((integer, subscriber) -> cleanUpSubscriber(subscriber));

synchronized (this) {
Collection<Subscriber<Payload>> subscribers;
Collection<LimitableRequestPublisher> publishers;
synchronized (RSocketClient.this) {
subscribers = receivers.values();
publishers = senders.values();

senders.clear();
receivers.clear();
}

subscribers.forEach(this::cleanUpSubscriber);
publishers.forEach(this::cleanUpLimitableRequestPublisher);

if (null != keepAliveSendSub) {
keepAliveSendSub.dispose();
}
}

private synchronized void cleanUpLimitableRequestPublisher(
LimitableRequestPublisher<?> limitableRequestPublisher) {
limitableRequestPublisher.cancel();
try {
limitableRequestPublisher.cancel();
} catch (Throwable t) {
errorConsumer.accept(t);
}
}

private synchronized void cleanUpSubscriber(Subscriber<?> subscriber) {
subscriber.onError(CLOSED_CHANNEL_EXCEPTION);
try {
subscriber.onError(CLOSED_CHANNEL_EXCEPTION);
} catch (Throwable t) {
errorConsumer.accept(t);
}
}

private void handleIncomingFrames(Frame frame) {
Expand Down