Merge pull request #1306 from mattrjacobs/add-error-handler-to-error-…

…swallowing-operators Hooked RxJavaPlugins errorHandler up within all operators that swallow onErrors
ReactiveX · Jun 2, 2014 · 6417f0b · 6417f0b
2 parents c375f56 + 3cf18a1
commit 6417f0b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 0 deletions.
diff --git a/rxjava-core/src/main/java/rx/internal/operators/OperatorMaterialize.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMaterialize.java
@@ -18,6 +18,7 @@
 import rx.Notification;
 import rx.Observable.Operator;
 import rx.Subscriber;
+import rx.plugins.RxJavaPlugins;
 
 /**
  * Turns all of the notifications from an Observable into <code>onNext</code> emissions, and marks
@@ -42,6 +43,7 @@ public void onCompleted() {
 
             @Override
             public void onError(Throwable e) {
+                RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
                 child.onNext(Notification.<T> createOnError(e));
                 child.onCompleted();
             }

diff --git a/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeDelayError.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorMergeDelayError.java
@@ -125,10 +125,12 @@ public void onError(Throwable e) {
         public void onCompleted() {
             complete();
         }
+
         void error(Throwable e) {
             exceptions.add(e);
             complete();
         }
+
         void complete() {
             if (WIP_UPDATER.decrementAndGet(this) == 0) {
                 if (exceptions.isEmpty()) {

diff --git a/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorFlatMap.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorFlatMap.java
@@ -20,6 +20,7 @@
 import rx.Subscriber;
 import rx.exceptions.OnErrorThrowable;
 import rx.functions.Func1;
+import rx.plugins.RxJavaPlugins;
 
 /**
  * Allows inserting onNext events into a stream when onError events are received
@@ -46,6 +47,7 @@ public void onCompleted() {
             @Override
             public void onError(Throwable e) {
                 try {
+                    RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
                     Observable<? extends T> resume = resumeFunction.call(OnErrorThrowable.from(e));
                     resume.unsafeSubscribe(new Subscriber<T>() {
 

diff --git a/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunction.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunction.java
@@ -19,6 +19,7 @@
 import rx.Observable.Operator;
 import rx.Subscriber;
 import rx.functions.Func1;
+import rx.plugins.RxJavaPlugins;
 
 /**
  * Instruct an Observable to pass control to another Observable (the return value of a function)
@@ -59,6 +60,7 @@ public void onCompleted() {
             @Override
             public void onError(Throwable e) {
                 try {
+                    RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
                     Observable<? extends T> resume = resumeFunction.call(e);
                     resume.unsafeSubscribe(child);
                 } catch (Throwable e2) {

diff --git a/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservable.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaObservable.java
@@ -18,6 +18,7 @@
 import rx.Observable;
 import rx.Observable.Operator;
 import rx.Subscriber;
+import rx.plugins.RxJavaPlugins;
 
 /**
  * Instruct an Observable to pass control to another Observable rather than invoking
@@ -58,6 +59,7 @@ public void onNext(T t) {
 
             @Override
             public void onError(Throwable e) {
+                RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
                 unsubscribe();
                 resumeSequence.unsafeSubscribe(child);
             }

diff --git a/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorReturn.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorOnErrorReturn.java
@@ -20,6 +20,7 @@
 import rx.Subscriber;
 import rx.exceptions.CompositeException;
 import rx.functions.Func1;
+import rx.plugins.RxJavaPlugins;
 
 /**
  * Instruct an Observable to emit a particular item to its Observer's <code>onNext</code> method
@@ -59,6 +60,7 @@ public void onNext(T t) {
             @Override
             public void onError(Throwable e) {
                 try {
+                    RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
                     T result = resultFunction.call(e);
 
                     child.onNext(result);

diff --git a/...-core/src/main/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservable.java b/...-core/src/main/java/rx/internal/operators/OperatorOnExceptionResumeNextViaObservable.java
@@ -18,6 +18,7 @@
 import rx.Observable;
 import rx.Observable.Operator;
 import rx.Subscriber;
+import rx.plugins.RxJavaPlugins;
 
 /**
  * Instruct an Observable to pass control to another Observable rather than invoking
@@ -63,6 +64,7 @@ public void onNext(T t) {
             @Override
             public void onError(Throwable e) {
                 if (e instanceof Exception) {
+                    RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
                     unsubscribe();
                     resumeSequence.unsafeSubscribe(child);
                 } else {