Have undeliverable errors on subscribe() sent to plugin error handler. (

#3887)
ReactiveX · Apr 29, 2016 · e58c4a7 · e58c4a7
1 parent 5da378f
commit e58c4a7
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/main/java/rx/Observable.java b/src/main/java/rx/Observable.java
@@ -8530,18 +8530,23 @@ static <T> Subscription subscribe(Subscriber<? super T> subscriber, Observable<T
         } catch (Throwable e) {
             // special handling for certain Throwable/Error/Exception types
             Exceptions.throwIfFatal(e);
-            // if an unhandled error occurs executing the onSubscribe we will propagate it
-            try {
-                subscriber.onError(hook.onSubscribeError(e));
-            } catch (Throwable e2) {
-                Exceptions.throwIfFatal(e2);
-                // if this happens it means the onError itself failed (perhaps an invalid function implementation)
-                // so we are unable to propagate the error correctly and will just throw
-                RuntimeException r = new RuntimeException("Error occurred attempting to subscribe [" + e.getMessage() + "] and then again while trying to pass to onError.", e2);
-                // TODO could the hook be the cause of the error in the on error handling.
-                hook.onSubscribeError(r);
-                // TODO why aren't we throwing the hook's return value.
-                throw r;
+            // in case the subscriber can't listen to exceptions anymore
+            if (subscriber.isUnsubscribed()) {
+                RxJavaPluginUtils.handleException(hook.onSubscribeError(e));
+            } else {
+                // if an unhandled error occurs executing the onSubscribe we will propagate it
+                try {
+                    subscriber.onError(hook.onSubscribeError(e));
+                } catch (Throwable e2) {
+                    Exceptions.throwIfFatal(e2);
+                    // if this happens it means the onError itself failed (perhaps an invalid function implementation)
+                    // so we are unable to propagate the error correctly and will just throw
+                    RuntimeException r = new OnErrorFailedException("Error occurred attempting to subscribe [" + e.getMessage() + "] and then again while trying to pass to onError.", e2);
+                    // TODO could the hook be the cause of the error in the on error handling.
+                    hook.onSubscribeError(r);
+                    // TODO why aren't we throwing the hook's return value.
+                    throw r;
+                }
             }
             return Subscriptions.unsubscribed();
         }