addressed sonar issue with not handling interrupt during waiting

Signed-off-by: jarebudev <[email protected]>
open-feature · Apr 2, 2024 · b9e1ca6 · b9e1ca6
1 parent a483239
commit b9e1ca6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/main/java/dev/openfeature/sdk/EventSupport.java b/src/main/java/dev/openfeature/sdk/EventSupport.java
@@ -152,13 +152,15 @@ public void runHandler(Consumer<EventDetails> handler, EventDetails eventDetails
      * or timeout period has elapsed.
      */
     public void shutdown() {
+        taskExecutor.shutdown();
         try {
-            taskExecutor.shutdown();
             if (!taskExecutor.awaitTermination(SHUTDOWN_TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
                 log.warn("Task executor did not terminate before the timeout period had elapsed");
+                taskExecutor.shutdownNow();
             }
-        } catch (Exception e) {
-            log.warn("Exception while attempting to shutdown task executor", e);
+        } catch (InterruptedException e) {
+            taskExecutor.shutdownNow();
+            Thread.currentThread().interrupt();
         }
     }