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 index e3bec847c4d273f4156b46ad9aab483ea76cddf2..1ae1499ebbab4653b2d2f9bde7ea55a8e0d55693 100644 --- 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 retrofit2.Response; import rx.Observable.OnSubscribe; import rx.Subscriber; import rx.exceptions.CompositeException; +import rx.exceptions.Exceptions; import rx.plugins.RxJavaPlugins; final class BodyOnSubscribe implements OnSubscribe { @@ -51,6 +52,7 @@ final class BodyOnSubscribe implements OnSubscribe { 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 index 980b9f9491880644137c02e8659dd753654213a9..a76a86a4fc81947a6120d3f1b94a8002cbde4ccf 100644 --- 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 @@ final class CallOnSubscribe implements OnSubscribe> { 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 index ac6729a365e28b39d57db6158e9a90ee78a17984..798df5af83649c0074eef4c2b51c78bb5d5dd1ae 100644 --- 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 retrofit2.Response; import rx.Observable.OnSubscribe; import rx.Subscriber; import rx.exceptions.CompositeException; +import rx.exceptions.Exceptions; import rx.plugins.RxJavaPlugins; final class ResultOnSubscribe implements OnSubscribe> { @@ -51,6 +52,7 @@ final class ResultOnSubscribe implements OnSubscribe> { try { subscriber.onError(t); } catch (Throwable inner) { + Exceptions.throwIfFatal(inner); CompositeException composite = new CompositeException(t, inner); RxJavaPlugins.getInstance().getErrorHandler().handleError(composite); }