merge 1.0.x into master

Signed-off-by: Oleh Dokuka <[email protected]>
rsocket · Feb 27, 2021 · d3ae6fa · d3ae6fa
2 parents 7ceb7aa + ce62903
commit d3ae6fa
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/rsocket-core/src/test/java/io/rsocket/internal/subscriber/AssertSubscriber.java b/rsocket-core/src/test/java/io/rsocket/internal/subscriber/AssertSubscriber.java
@@ -943,6 +943,7 @@ void drain() {
       t = qs.poll();
       if (t == null) {
         if (done) {
+          qs.clear(); // clear upstream to terminated it due to the contract
           cdl.countDown();
           return;
         }