Merge pull request ReactiveX#1355 from akarnokd/ReplaySubjectDontAddUnsubscribedChild

benjchristensen · benjchristensen · commit 4b5347461f4b · 2014-06-12T09:29:48.000-07:00
Don't add the subscriber to the manager if it unsubscribed during the on...
diff --git a/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java b/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java
@@ -57,8 +57,10 @@ public void call(final Subscriber<? super T> child) {
         SubjectObserver<T> bo = new SubjectObserver<T>(child);
         addUnsubscriber(child, bo);
         onStart.call(bo);
-        if (add(bo) && child.isUnsubscribed()) {
-            remove(bo);
+        if (!child.isUnsubscribed()) {
+            if (add(bo) && child.isUnsubscribed()) {
+                remove(bo);
+            }
         }
     }
     /** Registers the unsubscribe action for the given subscriber. */

Original file line number	Diff line number	Diff line change
`@@ -57,8 +57,10 @@ public void call(final Subscriber<? super T> child) {`
`57`	`57`	`SubjectObserver<T> bo = new SubjectObserver<T>(child);`
`58`	`58`	`addUnsubscriber(child, bo);`
`59`	`59`	`onStart.call(bo);`
`60`		`- if (add(bo) && child.isUnsubscribed()) {`
`61`		`- remove(bo);`
	`60`	`+ if (!child.isUnsubscribed()) {`
	`61`	`+ if (add(bo) && child.isUnsubscribed()) {`
	`62`	`+ remove(bo);`
	`63`	`+ }`
`62`	`64`	`}`
`63`	`65`	`}`
`64`	`66`	`/** Registers the unsubscribe action for the given subscriber. */`