Terminate subscribers before clearing map

rsocket-core/src/main/java/io/rsocket/RSocketClient.java

@@ -432,21 +432,25 @@ private boolean contains(int streamId) {
   }
 
   protected void cleanup() {
-    Collection<Subscriber<Payload>> subscribers;
-    Collection<LimitableRequestPublisher> publishers;
-    synchronized (RSocketClient.this) {
-      subscribers = receivers.values();
-      publishers = senders.values();
-
-      senders.clear();
-      receivers.clear();
-    }
+    try {
+      Collection<Subscriber<Payload>> subscribers;
+      Collection<LimitableRequestPublisher> publishers;
+      synchronized (RSocketClient.this) {
+        subscribers = receivers.values();
+        publishers = senders.values();
+      }
 
-    subscribers.forEach(this::cleanUpSubscriber);
-    publishers.forEach(this::cleanUpLimitableRequestPublisher);
+      subscribers.forEach(this::cleanUpSubscriber);
+      publishers.forEach(this::cleanUpLimitableRequestPublisher);
 
-    if (null != keepAliveSendSub) {
-      keepAliveSendSub.dispose();
+      if (null != keepAliveSendSub) {
+        keepAliveSendSub.dispose();
+      }
+    } finally {
+      synchronized (this) {
+        senders.clear();
+        receivers.clear();
+      }
     }
   }
 

rsocket-core/src/test/java/io/rsocket/RSocketTest.java

@@ -16,18 +16,11 @@
 
 package io.rsocket;
 
-import static org.hamcrest.Matchers.empty;
-import static org.hamcrest.Matchers.is;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-
 import io.rsocket.exceptions.ApplicationException;
 import io.rsocket.test.util.LocalDuplexConnection;
 import io.rsocket.test.util.TestSubscriber;
 import io.rsocket.util.DefaultPayload;
 import io.rsocket.util.EmptyPayload;
-import java.util.ArrayList;
-import java.util.concurrent.CountDownLatch;
 import org.hamcrest.MatcherAssert;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -41,6 +34,15 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.nio.channels.ClosedChannelException;
+import java.util.ArrayList;
+import java.util.concurrent.CountDownLatch;
+
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+
 public class RSocketTest {
 
   @Rule public final SocketRule rule = new SocketRule();
@@ -85,6 +87,22 @@ public void testChannel() throws Exception {
 
     latch.await();
   }
+
+  @Test(timeout = 2_000L)
+  public void testCleanup() throws Exception {
+    CountDownLatch latch = new CountDownLatch(1);
+    rule.crs
+        .requestStream(DefaultPayload.create("hi"))
+        .doOnError(t -> {
+          Assert.assertTrue(t instanceof ClosedChannelException);
+          latch.countDown();
+        })
+        .subscribe();
+
+    rule.crs.cleanup();
+
+    latch.await();
+  }
 
   public static class SocketRule extends ExternalResource {
 
@@ -124,6 +142,11 @@ protected void init() {
                 public Mono<Payload> requestResponse(Payload payload) {
                   return Mono.just(payload);
                 }
+
+                @Override
+                public Flux<Payload> requestStream(Payload payload) {
+                  return Flux.never();
+                }
 
                 @Override
                 public Flux<Payload> requestChannel(Publisher<Payload> payloads) {