Blocks RefCount from connecting in case source sequence immediatelly …

…terminated. #1242 #1111
ReactiveX · May 27, 2017 · eac3337 · eac3337
1 parent f831ec3
commit eac3337
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 27 deletions.
diff --git a/RxSwift/Observables/Multicast.swift b/RxSwift/Observables/Multicast.swift
@@ -124,6 +124,9 @@ final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverT
 
     func run() -> Disposable {
         let subscription = _parent._source.subscribe(self)
+        if self.disposed {
+            return Disposables.create()
+        }
 
         _parent._lock.lock(); defer { _parent._lock.unlock() } // {
         if _parent._count == 0 {

diff --git a/Tests/RxSwiftTests/Observable+ShareReplay1Tests.swift b/Tests/RxSwiftTests/Observable+ShareReplay1Tests.swift
@@ -205,14 +205,7 @@ extension ObservableShareReplay1Test {
                 ])
 
             // unoptimized version of replay subject will make a subscription and kill it immediately
-            XCTAssertEqual(xs.subscriptions[0], Subscription(335, 365))
-
-            switch version {
-            case .composition:
-                XCTAssertTrue(xs.subscriptions.count == 2 && xs.subscriptions[1] == Subscription(440, 440))
-            case .optimized:
-                XCTAssertTrue(xs.subscriptions.count == 1)
-            }
+            XCTAssertEqual(xs.subscriptions, [Subscription(335, 365)])
         }
     }
 
@@ -275,15 +268,7 @@ extension ObservableShareReplay1Test {
                 completed(365)
                 ])
 
-            XCTAssertEqual(xs.subscriptions[0], Subscription(335, 365))
-
-            // unoptimized version of replay subject will make a subscription and kill it immediately
-            switch version {
-            case .composition:
-                XCTAssertTrue(xs.subscriptions.count == 2 && xs.subscriptions[1] == Subscription(440, 440))
-            case .optimized:
-                XCTAssertTrue(xs.subscriptions.count == 1)
-            }
+            XCTAssertEqual(xs.subscriptions, [Subscription(335, 365)])
         }
     }
 
@@ -401,18 +386,10 @@ extension ObservableShareReplay1Test {
                 completed(365)
                 ])
 
-            XCTAssertEqual(xs.subscriptions[0], Subscription(335, 365))
-
-            // unoptimized version of replay subject will make a subscription and kill it immediately
-            switch version {
-            case .composition:
-                XCTAssertTrue(xs.subscriptions.count == 2 && xs.subscriptions[1] == Subscription(440, 440))
-            case .optimized:
-                XCTAssertTrue(xs.subscriptions.count == 1)
-            }
+            XCTAssertEqual(xs.subscriptions, [Subscription(335, 365)])
         }
     }
-    
+
     #if TRACE_RESOURCES
         func testShareReplayReleasesResourcesOnComplete() {
             _ = Observable<Int>.just(1).shareReplay(1).subscribe()