Fail early if a null subscription is added to a CompositeSubscription.

jnlopar · jnlopar · commit 5154351f2c74 · 2015-01-12T14:33:48.000-08:00
Otherwise, it'll just fail late when unsubscribing, which is much harder
to trace.
diff --git a/src/main/java/rx/subscriptions/CompositeSubscription.java b/src/main/java/rx/subscriptions/CompositeSubscription.java
@@ -55,6 +55,9 @@ public synchronized boolean isUnsubscribed() {
      *          the {@link Subscription} to add
      */
     public void add(final Subscription s) {
+        if (s == null) {
+            throw new IllegalArgumentException("Added Subscription cannot be null.");
+        }
         Subscription unsubscribe = null;
         synchronized (this) {
             if (unsubscribed) {
diff --git a/src/test/java/rx/subscriptions/CompositeSubscriptionTest.java b/src/test/java/rx/subscriptions/CompositeSubscriptionTest.java
@@ -337,4 +337,11 @@ public void testTryRemoveIfNotIn() {
         
         csub.remove(csub1); // try removing agian
     }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddingNullSubscriptionIllegal() {
+      CompositeSubscription csub = new CompositeSubscription();
+      csub.add(null);
+    }
+
 }

Original file line number	Diff line number	Diff line change
`@@ -337,4 +337,11 @@ public void testTryRemoveIfNotIn() {`
`337`	`337`
`338`	`338`	`csub.remove(csub1); // try removing agian`
`339`	`339`	`}`
	`340`	`+`
	`341`	`+ @Test(expected = IllegalArgumentException.class)`
	`342`	`+ public void testAddingNullSubscriptionIllegal() {`
	`343`	`+ CompositeSubscription csub = new CompositeSubscription();`
	`344`	`+ csub.add(null);`
	`345`	`+ }`
	`346`	`+`
`340`	`347`	`}`