Skip to content

Remove ActionSubscription #1952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 1 addition & 31 deletions src/main/java/rx/subscriptions/Subscriptions.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,38 +46,8 @@ public static Subscription empty() {
* @return {@link Subscription}
*/
public static Subscription create(final Action0 unsubscribe) {
return new ActionSubscription(unsubscribe);
return BooleanSubscription.create(unsubscribe);
}
/**
* Subscription that delegates the unsubscription action to an Action0 instance
*/
private static final class ActionSubscription implements Subscription {
volatile Action0 actual;
static final AtomicReferenceFieldUpdater<ActionSubscription, Action0> ACTUAL_UPDATER
= AtomicReferenceFieldUpdater.newUpdater(ActionSubscription.class, Action0.class, "actual");
public ActionSubscription(Action0 action) {
this.actual = action != null ? action : Actions.empty();
}
@Override
public boolean isUnsubscribed() {
return actual == UNSUBSCRIBED_ACTION;
}
@Override
public void unsubscribe() {
Action0 a = ACTUAL_UPDATER.getAndSet(this, UNSUBSCRIBED_ACTION);
a.call();
}
/** The no-op unique action indicating an unsubscribed state. */
private static final Unsubscribed UNSUBSCRIBED_ACTION = new Unsubscribed();
/** Naming classes helps with debugging. */
private static final class Unsubscribed implements Action0 {
@Override
public void call() {

}
}
}


/**
* Converts a {@link Future} into a {@link Subscription} and cancels it when unsubscribed.
Expand Down