fix: handle interrupt when shutting down executors

bugsnag · Jul 8, 2021 · 46cfdfd · 46cfdfd
1 parent 66dd1e2
commit 46cfdfd
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/bugsnag-android-core/src/main/java/com/bugsnag/android/BackgroundTaskService.kt b/bugsnag-android-core/src/main/java/com/bugsnag/android/BackgroundTaskService.kt
@@ -164,11 +164,20 @@ internal class BackgroundTaskService(
         // shutdown the IO executor last.
         errorExecutor.shutdown()
         sessionExecutor.shutdown()
-        errorExecutor.awaitTermination(SHUTDOWN_WAIT_MS, TimeUnit.MILLISECONDS)
-        sessionExecutor.awaitTermination(SHUTDOWN_WAIT_MS, TimeUnit.MILLISECONDS)
+
+        errorExecutor.awaitTerminationSafe()
+        sessionExecutor.awaitTerminationSafe()
 
         // shutdown the IO executor last, waiting for any existing tasks to complete
         ioExecutor.shutdown()
-        ioExecutor.awaitTermination(SHUTDOWN_WAIT_MS, TimeUnit.MILLISECONDS)
+        ioExecutor.awaitTerminationSafe()
+    }
+
+    private fun ThreadPoolExecutor.awaitTerminationSafe() {
+        try {
+            awaitTermination(SHUTDOWN_WAIT_MS, TimeUnit.MILLISECONDS)
+        } catch (ignored: InterruptedException) {
+            // ignore interrupted exception as the JVM is shutting down
+        }
     }
 }