Merge pull request square#1986 from square/jw/throw-fatal

Propagate fatal exceptions even if already dispatching an error.
ugurak · Aug 21, 2016 · 34eb99f · 34eb99f
2 parents e02fb37 + 240e3cd
commit 34eb99f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/retrofit-adapters/rxjava/src/main/java/retrofit2/adapter/rxjava/BodyOnSubscribe.java b/retrofit-adapters/rxjava/src/main/java/retrofit2/adapter/rxjava/BodyOnSubscribe.java
@@ -19,6 +19,7 @@
 import rx.Observable.OnSubscribe;
 import rx.Subscriber;
 import rx.exceptions.CompositeException;
+import rx.exceptions.Exceptions;
 import rx.plugins.RxJavaPlugins;
 
 final class BodyOnSubscribe<T> implements OnSubscribe<T> {
@@ -51,6 +52,7 @@ private static class BodySubscriber<R> extends Subscriber<Response<R>> {
         try {
           subscriber.onError(t);
         } catch (Throwable inner) {
+          Exceptions.throwIfFatal(inner);
           CompositeException composite = new CompositeException(t, inner);
           RxJavaPlugins.getInstance().getErrorHandler().handleError(composite);
         }

diff --git a/retrofit-adapters/rxjava/src/main/java/retrofit2/adapter/rxjava/CallOnSubscribe.java b/retrofit-adapters/rxjava/src/main/java/retrofit2/adapter/rxjava/CallOnSubscribe.java
@@ -82,6 +82,7 @@ private static final class CallArbiter<T> extends AtomicBoolean
           try {
             subscriber.onError(t);
           } catch (Throwable inner) {
+            Exceptions.throwIfFatal(inner);
             CompositeException composite = new CompositeException(t, inner);
             RxJavaPlugins.getInstance().getErrorHandler().handleError(composite);
           }

diff --git a/retrofit-adapters/rxjava/src/main/java/retrofit2/adapter/rxjava/ResultOnSubscribe.java b/retrofit-adapters/rxjava/src/main/java/retrofit2/adapter/rxjava/ResultOnSubscribe.java
@@ -19,6 +19,7 @@
 import rx.Observable.OnSubscribe;
 import rx.Subscriber;
 import rx.exceptions.CompositeException;
+import rx.exceptions.Exceptions;
 import rx.plugins.RxJavaPlugins;
 
 final class ResultOnSubscribe<T> implements OnSubscribe<Result<T>> {
@@ -51,6 +52,7 @@ private static class ResultSubscriber<R> extends Subscriber<Response<R>> {
         try {
           subscriber.onError(t);
         } catch (Throwable inner) {
+          Exceptions.throwIfFatal(inner);
           CompositeException composite = new CompositeException(t, inner);
           RxJavaPlugins.getInstance().getErrorHandler().handleError(composite);
         }