Add vararg of Subscriptions to composite subscription.

Author: Klemen Kresnik

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

@@ -15,46 +15,46 @@
  */
 package rx.subscriptions;
 
+import rx.Subscription;
+import rx.exceptions.Exceptions;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import rx.Subscription;
-import rx.exceptions.*;
-
 /**
  * Subscription that represents a group of Subscriptions that are unsubscribed together.
  * <p>
  * All methods of this class are thread-safe.
  */
 public final class CompositeSubscription implements Subscription {
-
+    
     private Set<Subscription> subscriptions;
     private volatile boolean unsubscribed;
-
+    
     public CompositeSubscription() {
     }
-
+    
     public CompositeSubscription(final Subscription... subscriptions) {
         this.subscriptions = new HashSet<Subscription>(Arrays.asList(subscriptions));
     }
-
+    
     @Override
     public boolean isUnsubscribed() {
         return unsubscribed;
     }
-
+    
     /**
      * Adds a new {@link Subscription} to this {@code CompositeSubscription} if the
      * {@code CompositeSubscription} is not yet unsubscribed. If the {@code CompositeSubscription} <em>is</em>
      * unsubscribed, {@code add} will indicate this by explicitly unsubscribing the new {@code Subscription} as
      * well.
      *
      * @param s
-     *          the {@link Subscription} to add
+     *         the {@link Subscription} to add
      */
     public void add(final Subscription s) {
         if (s.isUnsubscribed()) {
@@ -74,13 +74,47 @@ public void add(final Subscription s) {
         // call after leaving the synchronized block so we're not holding a lock while executing this
         s.unsubscribe();
     }
-
+    
+    /**
+     * Adds collection of {@link Subscription} to this {@code CompositeSubscription} if the
+     * {@code CompositeSubscription} is not yet unsubscribed. If the {@code CompositeSubscription} <em>is</em>
+     * unsubscribed, {@code addAll} will indicate this by explicitly unsubscribing all {@code Subscription} in collection as
+     * well.
+     *
+     * @param subscriptions
+     *         the collection of {@link Subscription} to add
+     */
+    public void addAll(final Subscription... subscriptions) {
+        List<Subscription> subscriptionList = new ArrayList<Subscription>(4);
+        for (Subscription s : subscriptions) {
+            if (!s.isUnsubscribed()) {
+                subscriptionList.add(s);
+            }
+        }
+        
+        if (!unsubscribed) {
+            synchronized (this) {
+                if (!unsubscribed) {
+                    if (this.subscriptions == null) {
+                        this.subscriptions = new HashSet<Subscription>(4);
+                    }
+                    this.subscriptions.addAll(subscriptionList);
+                    return;
+                }
+            }
+        }
+        
+        for (Subscription s : subscriptionList) {
+            s.unsubscribe();
+        }
+    }
+    
     /**
      * Removes a {@link Subscription} from this {@code CompositeSubscription}, and unsubscribes the
      * {@link Subscription}.
      *
      * @param s
-     *          the {@link Subscription} to remove
+     *         the {@link Subscription} to remove
      */
     public void remove(final Subscription s) {
         if (!unsubscribed) {
@@ -97,7 +131,7 @@ public void remove(final Subscription s) {
             }
         }
     }
-
+    
     /**
      * Unsubscribes any subscriptions that are currently part of this {@code CompositeSubscription} and remove
      * them from the {@code CompositeSubscription} so that the {@code CompositeSubscription} is empty and
@@ -117,7 +151,7 @@ public void clear() {
             unsubscribeFromAll(unsubscribe);
         }
     }
-
+    
     /**
      * Unsubscribes itself and all inner subscriptions.
      * <p>After call of this method, new {@code Subscription}s added to {@link CompositeSubscription}
@@ -139,7 +173,7 @@ public void unsubscribe() {
             unsubscribeFromAll(unsubscribe);
         }
     }
-
+    
     private static void unsubscribeFromAll(Collection<Subscription> subscriptions) {
         if (subscriptions == null) {
             return;
@@ -157,7 +191,7 @@ private static void unsubscribeFromAll(Collection<Subscription> subscriptions) {
         }
         Exceptions.throwIfAny(es);
     }
-
+    
     /**
      * Returns true if this composite is not unsubscribed and contains subscriptions.
      *