fix a race

testcontainers · Apr 9, 2020 · d3409df · d3409df
1 parent 98515fc
commit d3409df
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java b/modules/r2dbc/src/main/java/org/testcontainers/r2dbc/ConnectionPublisher.java
@@ -108,6 +108,8 @@ class ProxySubscriptionState extends SubscriptionState implements Subscriber<Con
 
             private Subscription s;
 
+            private boolean cancelled = false;
+
             ProxySubscriptionState(Publisher<? extends Connection> publisher) {
                 this.publisher = publisher;
             }
@@ -123,14 +125,21 @@ public void request(long n) {
             }
 
             @Override
-            public void cancel() {
-                s.cancel();
+            public synchronized void cancel() {
+                cancelled = true;
+                if (s != null) {
+                    s.cancel();
+                }
             }
 
             @Override
-            public void onSubscribe(Subscription s) {
+            public synchronized void onSubscribe(Subscription s) {
                 this.s = s;
-                s.request(1);
+                if (!cancelled) {
+                    s.request(1);
+                } else {
+                    s.cancel();
+                }
             }
 
             @Override