Merge pull request #1767 from loganj/uncaught_executor

ExecutorScheduler delivers uncaught exceptions

Author: benjchristensen

src/main/java/rx/schedulers/ExecutorScheduler.java

@@ -173,6 +173,8 @@ public void run() {
                 actual.call();
             } catch (Throwable t) {
                 RxJavaPlugins.getInstance().getErrorHandler().handleError(t);
+                Thread thread = Thread.currentThread();
+                thread.getUncaughtExceptionHandler().uncaughtException(thread, t);
             } finally {
                 unsubscribe();
             }

src/test/java/rx/schedulers/ExecutorSchedulerTest.java

@@ -15,6 +15,7 @@
  */
 package rx.schedulers;
 
+import org.junit.Test;
 import rx.Scheduler;
 import rx.internal.util.RxThreadFactory;
 
@@ -29,5 +30,14 @@ public class ExecutorSchedulerTest extends AbstractSchedulerConcurrencyTests {
     protected Scheduler getScheduler() {
         return Schedulers.from(executor);
     }
-    
+
+    @Test
+    public final void testUnhandledErrorIsDeliveredToThreadHandler() throws InterruptedException {
+        SchedulerTests.testUnhandledErrorIsDeliveredToThreadHandler(getScheduler());
+    }
+
+    @Test
+    public final void testHandledErrorIsNotDeliveredToThreadHandler() throws InterruptedException {
+        SchedulerTests.testHandledErrorIsNotDeliveredToThreadHandler(getScheduler());
+    }
 }