Merge pull request #1950 from zsxwing/unsubscribed

Add "Subscriptions.unsubscribed" to fix the 'isUnsubscribed' issue

Author: benjchristensen

src/main/java/rx/Observable.java

@@ -7321,7 +7321,7 @@ public final Subscription unsafeSubscribe(Subscriber<? super T> subscriber) {
                 // TODO why aren't we throwing the hook's return value.
                 throw r;
             }
-            return Subscriptions.empty();
+            return Subscriptions.unsubscribed();
         }
     }
 
@@ -7410,7 +7410,7 @@ public final Subscription subscribe(Subscriber<? super T> subscriber) {
                 // TODO why aren't we throwing the hook's return value.
                 throw r;
             }
-            return Subscriptions.empty();
+            return Subscriptions.unsubscribed();
         }
     }
 

src/main/java/rx/internal/operators/OperatorTimeoutWithSelector.java

@@ -51,7 +51,7 @@ public Subscription call(
                     } catch (Throwable t) {
                         Exceptions.throwIfFatal(t);
                         timeoutSubscriber.onError(t);
-                        return Subscriptions.empty();
+                        return Subscriptions.unsubscribed();
                     }
                     return o.unsafeSubscribe(new Subscriber<U>() {
 
@@ -72,7 +72,7 @@ public void onNext(U t) {
 
                     });
                 } else {
-                    return Subscriptions.empty();
+                    return Subscriptions.unsubscribed();
                 }
             }
         }, new TimeoutStub<T>() {
@@ -87,7 +87,7 @@ public Subscription call(
                 } catch (Throwable t) {
                     Exceptions.throwIfFatal(t);
                     timeoutSubscriber.onError(t);
-                    return Subscriptions.empty();
+                    return Subscriptions.unsubscribed();
                 }
                 return o.unsafeSubscribe(new Subscriber<V>() {
 

src/main/java/rx/internal/schedulers/NewThreadWorker.java

@@ -58,7 +58,7 @@ public Subscription schedule(final Action0 action) {
     @Override
     public Subscription schedule(final Action0 action, long delayTime, TimeUnit unit) {
         if (isUnsubscribed) {
-            return Subscriptions.empty();
+            return Subscriptions.unsubscribed();
         }
         return scheduleActual(action, delayTime, unit);
     }

src/main/java/rx/schedulers/CachedThreadScheduler.java

@@ -141,7 +141,7 @@ public Subscription schedule(Action0 action) {
         public Subscription schedule(Action0 action, long delayTime, TimeUnit unit) {
             if (innerSubscription.isUnsubscribed()) {
                 // don't schedule, we are unsubscribed
-                return Subscriptions.empty();
+                return Subscriptions.unsubscribed();
             }
 
             ScheduledAction s = threadWorker.scheduleActual(action, delayTime, unit);

src/main/java/rx/schedulers/EventLoopsScheduler.java

@@ -95,7 +95,7 @@ public Subscription schedule(Action0 action) {
         public Subscription schedule(Action0 action, long delayTime, TimeUnit unit) {
             if (innerSubscription.isUnsubscribed()) {
                 // don't schedule, we are unsubscribed
-                return Subscriptions.empty();
+                return Subscriptions.unsubscribed();
             }
 
             ScheduledAction s = poolWorker.scheduleActual(action, delayTime, unit);

src/main/java/rx/schedulers/ExecutorScheduler.java

@@ -71,7 +71,7 @@ public ExecutorSchedulerWorker(Executor executor) {
         @Override
         public Subscription schedule(Action0 action) {
             if (isUnsubscribed()) {
-                return Subscriptions.empty();
+                return Subscriptions.unsubscribed();
             }
             ExecutorAction ea = new ExecutorAction(action, tasks);
             tasks.add(ea);
@@ -106,7 +106,7 @@ public Subscription schedule(final Action0 action, long delayTime, TimeUnit unit
                 return schedule(action);
             }
             if (isUnsubscribed()) {
-                return Subscriptions.empty();
+                return Subscriptions.unsubscribed();
             }
             ScheduledExecutorService service;
             if (executor instanceof ScheduledExecutorService) {

src/main/java/rx/schedulers/ImmediateScheduler.java

@@ -56,7 +56,7 @@ public Subscription schedule(Action0 action, long delayTime, TimeUnit unit) {
         @Override
         public Subscription schedule(Action0 action) {
             action.call();
-            return Subscriptions.empty();
+            return Subscriptions.unsubscribed();
         }
 
         @Override

src/main/java/rx/schedulers/TrampolineScheduler.java

@@ -68,7 +68,7 @@ public Subscription schedule(Action0 action, long delayTime, TimeUnit unit) {
 
         private Subscription enqueue(Action0 action, long execTime) {
             if (innerSubscription.isUnsubscribed()) {
-                return Subscriptions.empty();
+                return Subscriptions.unsubscribed();
             }
             final TimedAction timedAction = new TimedAction(action, execTime, COUNTER_UPDATER.incrementAndGet(TrampolineScheduler.this));
             queue.add(timedAction);
@@ -81,7 +81,7 @@ private Subscription enqueue(Action0 action, long execTime) {
                         polled.action.call();
                     }
                 } while (wip.decrementAndGet() > 0);
-                return Subscriptions.empty();
+                return Subscriptions.unsubscribed();
             } else {
                 // queue wasn't empty, a parent is already processing so we just add to the end of the queue
                 return Subscriptions.create(new Action0() {

src/main/java/rx/subscriptions/MultipleAssignmentSubscription.java

@@ -25,9 +25,8 @@
  * if unsubscribed.
  */
 public final class MultipleAssignmentSubscription implements Subscription {
-    /** The shared empty state. */
-    static final State EMPTY_STATE = new State(false, Subscriptions.empty());
-    volatile State state = EMPTY_STATE;
+
+    volatile State state = new State(false, Subscriptions.empty());
     static final AtomicReferenceFieldUpdater<MultipleAssignmentSubscription, State> STATE_UPDATER
             = AtomicReferenceFieldUpdater.newUpdater(MultipleAssignmentSubscription.class, State.class, "state");
 

src/main/java/rx/subscriptions/RefCountSubscription.java

@@ -80,7 +80,7 @@ public Subscription get() {
         do {
             oldState = state;
             if (oldState.isUnsubscribed) {
-                return Subscriptions.empty();
+                return Subscriptions.unsubscribed();
             } else {
                 newState = oldState.addChild();
             }