IllegalArgumentException > NPE

Author: jnlopar

src/main/java/rx/subscriptions/CompositeSubscription.java

@@ -56,7 +56,7 @@ public synchronized boolean isUnsubscribed() {
      */
     public void add(final Subscription s) {
         if (s == null) {
-            throw new IllegalArgumentException("Added Subscription cannot be null.");
+            throw new NullPointerException("Added Subscription cannot be null.");
         }
         Subscription unsubscribe = null;
         synchronized (this) {

src/test/java/rx/subscriptions/CompositeSubscriptionTest.java

@@ -338,7 +338,7 @@ public void testTryRemoveIfNotIn() {
         csub.remove(csub1); // try removing agian
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test(expected = NullPointerException.class)
     public void testAddingNullSubscriptionIllegal() {
         CompositeSubscription csub = new CompositeSubscription();
         csub.add(null);