TestExecutorService: DefaultUncaughtExceptionHandler -> try / catch

libj · Dec 30, 2023 · b48f5e8 · b48f5e8
1 parent 79eb779
commit b48f5e8
Showing 1 changed file with 56 additions and 18 deletions.
diff --git a/src/main/java/org/libj/test/TestExecutorService.java b/src/main/java/org/libj/test/TestExecutorService.java
@@ -16,7 +16,6 @@
 
 package org.libj.test;
 
-import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -36,15 +35,6 @@
 public class TestExecutorService implements ExecutorService {
   protected static final ConcurrentHashMap<Thread,Throwable> exception = new ConcurrentHashMap<>();
 
-  static {
-    Thread.setDefaultUncaughtExceptionHandler(new UncaughtExceptionHandler() {
-      @Override
-      public void uncaughtException(final Thread t, final Throwable e) {
-        exception.put(t, e);
-      }
-    });
-  }
-
   protected ExecutorService target;
   private final ArrayList<Thread> threads = new ArrayList<>();
 
@@ -62,7 +52,13 @@ public TestExecutorService(final ExecutorService target) {
   public void execute(final Runnable command) {
     target.execute(() -> {
       threads.add(Thread.currentThread());
-      command.run();
+      try {
+        command.run();
+      }
+      catch (final Throwable t) {
+        exception.put(Thread.currentThread(), t);
+        throw t;
+      }
     });
   }
 
@@ -90,23 +86,41 @@ public boolean isTerminated() {
   public <T> Future<T> submit(final Callable<T> task) {
     return target.submit(() -> {
       threads.add(Thread.currentThread());
-      return task.call();
+      try {
+        return task.call();
+      }
+      catch (final Throwable t) {
+        exception.put(Thread.currentThread(), t);
+        throw t;
+      }
     });
   }
 
   @Override
   public <T> Future<T> submit(final Runnable task, final T result) {
     return target.submit(() -> {
       threads.add(Thread.currentThread());
-      task.run();
+      try {
+        task.run();
+      }
+      catch (final Throwable t) {
+        exception.put(Thread.currentThread(), t);
+        throw t;
+      }
     }, result);
   }
 
   @Override
   public Future<?> submit(final Runnable task) {
     return target.submit(() -> {
       threads.add(Thread.currentThread());
-      task.run();
+      try {
+        task.run();
+      }
+      catch (final Throwable t) {
+        exception.put(Thread.currentThread(), t);
+        throw t;
+      }
     });
   }
 
@@ -119,7 +133,13 @@ public <T> List<Future<T>> invokeAll(final Collection<? extends Callable<T>> tas
         @Override
         public T call() throws Exception {
           threads.add(Thread.currentThread());
-          return task.call();
+          try {
+            return task.call();
+          }
+          catch (final Throwable t) {
+            exception.put(Thread.currentThread(), t);
+            throw t;
+          }
         }
       });
     }
@@ -136,7 +156,13 @@ public <T> List<Future<T>> invokeAll(final Collection<? extends Callable<T>> tas
         @Override
         public T call() throws Exception {
           threads.add(Thread.currentThread());
-          return task.call();
+          try {
+            return task.call();
+          }
+          catch (final Throwable t) {
+            exception.put(Thread.currentThread(), t);
+            throw t;
+          }
         }
       });
     }
@@ -153,7 +179,13 @@ public <T> T invokeAny(final Collection<? extends Callable<T>> tasks) throws Int
         @Override
         public T call() throws Exception {
           threads.add(Thread.currentThread());
-          return task.call();
+          try {
+            return task.call();
+          }
+          catch (final Throwable t) {
+            exception.put(Thread.currentThread(), t);
+            throw t;
+          }
         }
       });
     }
@@ -170,7 +202,13 @@ public <T> T invokeAny(final Collection<? extends Callable<T>> tasks, final long
         @Override
         public T call() throws Exception {
           threads.add(Thread.currentThread());
-          return task.call();
+          try {
+            return task.call();
+          }
+          catch (final Throwable t) {
+            exception.put(Thread.currentThread(), t);
+            throw t;
+          }
         }
       });
     }