Dont keep indents on empty lines.

ReactiveX · Feb 19, 2016 · 5ec27bf · 5ec27bf
1 parent edacaf9
commit 5ec27bf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/src/main/java/rx/subscriptions/CompositeSubscription.java b/src/main/java/rx/subscriptions/CompositeSubscription.java
@@ -31,22 +31,22 @@
  * 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>
@@ -74,7 +74,7 @@ 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>
@@ -91,7 +91,7 @@ public void addAll(final Subscription... subscriptions) {
                 subscriptionList.add(s);
             }
         }
-        
+
         if (!unsubscribed) {
             synchronized (this) {
                 if (!unsubscribed) {
@@ -103,12 +103,12 @@ public void addAll(final Subscription... subscriptions) {
                 }
             }
         }
-        
+
         for (Subscription s : subscriptionList) {
             s.unsubscribe();
         }
     }
-    
+
     /**
      * Removes a {@link Subscription} from this {@code CompositeSubscription}, and unsubscribes the
      * {@link Subscription}.
@@ -131,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
@@ -151,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}
@@ -173,7 +173,7 @@ public void unsubscribe() {
             unsubscribeFromAll(unsubscribe);
         }
     }
-    
+
     private static void unsubscribeFromAll(Collection<Subscription> subscriptions) {
         if (subscriptions == null) {
             return;
@@ -191,7 +191,7 @@ private static void unsubscribeFromAll(Collection<Subscription> subscriptions) {
         }
         Exceptions.throwIfAny(es);
     }
-    
+
     /**
      * Returns true if this composite is not unsubscribed and contains subscriptions.
      *

diff --git a/src/test/java/rx/subscriptions/CompositeSubscriptionTest.java b/src/test/java/rx/subscriptions/CompositeSubscriptionTest.java
@@ -65,7 +65,7 @@ public boolean isUnsubscribed() {
 
         assertEquals(2, counter.get());
     }
-    
+
     @Test(timeout = 1000)
     public void shouldUnsubscribeAll() throws InterruptedException {
         final AtomicInteger counter = new AtomicInteger();