Skip to content

1.x: onErrorResumeNext(Func1) should not call plugin handler there #3685

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

Closed
akarnokd wants to merge 1 commit into from
Closed

1.x: onErrorResumeNext(Func1) should not call plugin handler there #3685

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
2 changes: 1 addition & 1 deletion src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ public void onCompleted() {
public void onError(Throwable e) {
if (done) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
return;
}
done = true;
try {
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
unsubscribe();
Subscriber<T> next = new Subscriber<T>() {
@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ public void onNext(T t) {
public void onError(Throwable e) {
if (done) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
return;
}
done = true;
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
unsubscribe();
resumeSequence.unsafeSubscribe(child);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/rx/internal/operators/OperatorOnErrorReturn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ public void onNext(T t) {
public void onError(Throwable e) {
if (done) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
return;
}
done = true;
try {
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
unsubscribe();
T result = resultFunction.call(e);
child.onNext(result);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ public void onNext(T t) {
public void onError(Throwable e) {
if (done) {
Exceptions.throwIfFatal(e);
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
return;
}
done = true;
if (e instanceof Exception) {
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
unsubscribe();
resumeSequence.unsafeSubscribe(child);
} else {
Expand Down