Merge pull request #1031 from benjchristensen/subject-npe

benjchristensen · benjchristensen · commit 33819b5dca9f · 2014-04-11T12:54:03.000-07:00
Fix NPE in SubjectSubscriptionManager
diff --git a/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java b/rxjava-core/src/main/java/rx/subjects/SubjectSubscriptionManager.java
@@ -94,7 +94,7 @@ public void call() {
                         }));
                         if (subscription.isUnsubscribed()) {
                             addedObserver = false;
-                            break;
+                            return;
                         }
                         // on subscribe add it to the map of outbound observers to notify
                         newState = current.addObserver(subscription, observer);

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public void call() {`
`94`	`94`	`}));`
`95`	`95`	`if (subscription.isUnsubscribed()) {`
`96`	`96`	`addedObserver = false;`
`97`		`- break;`
	`97`	`+ return;`
`98`	`98`	`}`
`99`	`99`	`// on subscribe add it to the map of outbound observers to notify`
`100`	`100`	`newState = current.addObserver(subscription, observer);`