synchronize access to subscription for null check in OperatorMulticast

ReactiveX · Sep 28, 2014 · b8da4a9 · b8da4a9
1 parent eb6ae37
commit b8da4a9
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/rxjava-core/src/main/java/rx/internal/operators/OperatorMulticast.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMulticast.java
@@ -137,8 +137,13 @@ public void call() {
             }));
 
             // now that everything is hooked up let's subscribe
-            if (subscription!=null)
-               source.unsafeSubscribe(subscription);
+            // as long as the subscription is not null
+            boolean subscriptionIsNull;
+            synchronized(guard) {
+                subscriptionIsNull = subscription == null;
+            }
+            if (!subscriptionIsNull)
+                source.unsafeSubscribe(subscription);
         }
     }
 }