Skip to content

Commit 0871af0

Browse files
committed
1.x: onErrorResumeNext(Func1) should not call plugin handler there
1 parent 182833e commit 0871af0

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ public void onCompleted() {
7070
public void onError(Throwable e) {
7171
if (done) {
7272
Exceptions.throwIfFatal(e);
73+
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
7374
return;
7475
}
7576
done = true;
7677
try {
77-
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
7878
unsubscribe();
7979
Subscriber<T> next = new Subscriber<T>() {
8080
@Override

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ public void onNext(T t) {
6868
public void onError(Throwable e) {
6969
if (done) {
7070
Exceptions.throwIfFatal(e);
71+
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
7172
return;
7273
}
7374
done = true;
74-
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
7575
unsubscribe();
7676
resumeSequence.unsafeSubscribe(child);
7777
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ public void onNext(T t) {
6969
public void onError(Throwable e) {
7070
if (done) {
7171
Exceptions.throwIfFatal(e);
72+
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
7273
return;
7374
}
7475
done = true;
7576
try {
76-
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
7777
unsubscribe();
7878
T result = resultFunction.call(e);
7979
child.onNext(result);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ public void onNext(T t) {
7272
public void onError(Throwable e) {
7373
if (done) {
7474
Exceptions.throwIfFatal(e);
75+
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
7576
return;
7677
}
7778
done = true;
7879
if (e instanceof Exception) {
79-
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
8080
unsubscribe();
8181
resumeSequence.unsafeSubscribe(child);
8282
} else {

0 commit comments

Comments
 (0)