Skip to content

Fix calling dispose() in terminal event #29

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.

Sign up for GitHub

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
ZacSweers merged 1 commit into from
Feb 26, 2017
Merged

Fix calling dispose() in terminal event #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 24 additions & 13 deletions autodispose/src/main/java/com/uber/autodispose/AutoDisposingCompletableObserverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,36 @@ final class AutoDisposingCompletableObserverImpl implements AutoDisposingComplet
@Override public final void dispose() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
AutoDisposableHelper.dispose(mainDisposable);
}
}

// If we've never actually called the downstream onSubscribe (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty disposable instance
// to abide by the Observer contract.
if (mainDisposable.get() == null) {
try {
onSubscribe.accept(Disposables.disposed());
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
private void lazyDispose() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
mainDisposable.lazySet(AutoDisposableHelper.DISPOSED);
}
}

private void callMainSubscribeIfNecessary() {
// If we've never actually called the downstream onSubscribe (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty disposable instance
// to abide by the Observer contract.
if (mainDisposable.get() == null) {
try {
onSubscribe.accept(Disposables.disposed());
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
AutoDisposableHelper.dispose(mainDisposable);
}
}

@Override public final void onComplete() {
if (!isDisposed()) {
dispose();
lazyDispose();
try {
onComplete.run();
} catch (Exception e) {
Expand All @@ -106,7 +117,7 @@ final class AutoDisposingCompletableObserverImpl implements AutoDisposingComplet

@Override public final void onError(Throwable e) {
if (!isDisposed()) {
dispose();
lazyDispose();
try {
onError.accept(e);
} catch (Exception e1) {
Expand Down
39 changes: 25 additions & 14 deletions autodispose/src/main/java/com/uber/autodispose/AutoDisposingMaybeObserverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,25 +79,36 @@ final class AutoDisposingMaybeObserverImpl<T> implements AutoDisposingMaybeObser
@Override public final void dispose() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
AutoDisposableHelper.dispose(mainDisposable);
}
}

// If we've never actually called the downstream onSubscribe (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty disposable instance
// to abide by the Observer contract.
if (mainDisposable.get() == null) {
try {
onSubscribe.accept(Disposables.disposed());
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
private void lazyDispose() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
mainDisposable.lazySet(AutoDisposableHelper.DISPOSED);
}
}

private void callMainSubscribeIfNecessary() {
// If we've never actually called the downstream onSubscribe (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty disposable instance
// to abide by the Observer contract.
if (mainDisposable.get() == null) {
try {
onSubscribe.accept(Disposables.disposed());
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
AutoDisposableHelper.dispose(mainDisposable);
}
}

@Override public final void onSuccess(T value) {
if (!isDisposed()) {
dispose();
lazyDispose();
try {
onSuccess.accept(value);
} catch (Exception e) {
Expand All @@ -109,7 +120,7 @@ final class AutoDisposingMaybeObserverImpl<T> implements AutoDisposingMaybeObser

@Override public final void onError(Throwable e) {
if (!isDisposed()) {
dispose();
lazyDispose();
try {
onError.accept(e);
} catch (Exception e1) {
Expand All @@ -121,7 +132,7 @@ final class AutoDisposingMaybeObserverImpl<T> implements AutoDisposingMaybeObser

@Override public final void onComplete() {
if (!isDisposed()) {
dispose();
lazyDispose();
try {
onComplete.run();
} catch (Exception e) {
Expand Down
37 changes: 24 additions & 13 deletions autodispose/src/main/java/com/uber/autodispose/AutoDisposingObserverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,19 +79,30 @@ final class AutoDisposingObserverImpl<T> implements AutoDisposingObserver<T> {
@Override public final void dispose() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
AutoDisposableHelper.dispose(mainDisposable);
}
}

// If we've never actually called the downstream onSubscribe (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty disposable instance
// to abide by the Observer contract.
if (mainDisposable.get() == null) {
try {
onSubscribe.accept(Disposables.disposed());
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
private void lazyDispose() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
mainDisposable.lazySet(AutoDisposableHelper.DISPOSED);
}
}

private void callMainSubscribeIfNecessary() {
// If we've never actually called the downstream onSubscribe (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty disposable instance
// to abide by the Observer contract.
if (mainDisposable.get() == null) {
try {
onSubscribe.accept(Disposables.disposed());
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
AutoDisposableHelper.dispose(mainDisposable);
}
}

Expand All @@ -108,7 +119,7 @@ final class AutoDisposingObserverImpl<T> implements AutoDisposingObserver<T> {

@Override public final void onError(Throwable e) {
if (!isDisposed()) {
dispose();
lazyDispose();
try {
onError.accept(e);
} catch (Exception e1) {
Expand All @@ -120,7 +131,7 @@ final class AutoDisposingObserverImpl<T> implements AutoDisposingObserver<T> {

@Override public final void onComplete() {
if (!isDisposed()) {
dispose();
lazyDispose();
try {
onComplete.run();
} catch (Exception e) {
Expand Down
37 changes: 24 additions & 13 deletions autodispose/src/main/java/com/uber/autodispose/AutoDisposingSingleObserverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,25 +75,36 @@ final class AutoDisposingSingleObserverImpl<T> implements AutoDisposingSingleObs
@Override public final void dispose() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
AutoDisposableHelper.dispose(mainDisposable);
}
}

// If we've never actually called the downstream onSubscribe (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty disposable instance
// to abide by the Observer contract.
if (mainDisposable.get() == null) {
try {
onSubscribe.accept(Disposables.disposed());
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
private void lazyDispose() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
mainDisposable.lazySet(AutoDisposableHelper.DISPOSED);
}
}

private void callMainSubscribeIfNecessary() {
// If we've never actually called the downstream onSubscribe (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty disposable instance
// to abide by the Observer contract.
if (mainDisposable.get() == null) {
try {
onSubscribe.accept(Disposables.disposed());
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
AutoDisposableHelper.dispose(mainDisposable);
}
}

@Override public final void onSuccess(T value) {
if (!isDisposed()) {
dispose();
lazyDispose();
try {
onSuccess.accept(value);
} catch (Exception e) {
Expand All @@ -105,7 +116,7 @@ final class AutoDisposingSingleObserverImpl<T> implements AutoDisposingSingleObs

@Override public final void onError(Throwable e) {
if (!isDisposed()) {
dispose();
lazyDispose();
try {
onError.accept(e);
} catch (Exception e1) {
Expand Down
37 changes: 24 additions & 13 deletions autodispose/src/main/java/com/uber/autodispose/AutoDisposingSubscriberImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,19 +95,30 @@ final class AutoDisposingSubscriberImpl<T> implements AutoDisposingSubscriber<T>
@Override public final void cancel() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
AutoSubscriptionHelper.cancel(mainSubscription);
}
}

// If we've never actually started the upstream subscription (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty subscription instance
// to abide by the Subscriber contract.
if (mainSubscription.get() == null) {
try {
onSubscribe.accept(EmptySubscription.INSTANCE);
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
private void lazyCancel() {
synchronized (this) {
AutoDisposableHelper.dispose(lifecycleDisposable);
callMainSubscribeIfNecessary();
mainSubscription.lazySet(AutoSubscriptionHelper.CANCELLED);
}
}

private void callMainSubscribeIfNecessary() {
// If we've never actually started the upstream subscription (i.e. requested immediately in
// onSubscribe and had a terminal event), we need to still send an empty subscription instance
// to abide by the Subscriber contract.
if (mainSubscription.get() == null) {
try {
onSubscribe.accept(EmptySubscription.INSTANCE);
} catch (Exception e) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.onError(e);
}
AutoSubscriptionHelper.cancel(mainSubscription);
}
}

Expand All @@ -132,7 +143,7 @@ final class AutoDisposingSubscriberImpl<T> implements AutoDisposingSubscriber<T>

@Override public void onError(Throwable e) {
if (!isDisposed()) {
cancel();
lazyCancel();
try {
onError.accept(e);
} catch (Exception e1) {
Expand All @@ -144,7 +155,7 @@ final class AutoDisposingSubscriberImpl<T> implements AutoDisposingSubscriber<T>

@Override public final void onComplete() {
if (!isDisposed()) {
cancel();
lazyCancel();
try {
onComplete.run();
} catch (Exception e) {
Expand Down