Merge bcbdcc8 into 654c2dc

getsentry · Oct 16, 2024 · 0af72d4 · 0af72d4
2 parents 654c2dc + bcbdcc8
commit 0af72d4
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/SentryNdk.java
@@ -69,6 +69,15 @@ public static void init(@NotNull final SentryAndroidOptions options) {
 
   /** Closes the NDK integration */
   public static void close() {
-    shutdown();
+    try {
+      if (loadLibraryLatch.await(2000, TimeUnit.MILLISECONDS)) {
+        shutdown();
+      } else {
+        throw new IllegalStateException("Timeout waiting for Sentry NDK library to load");
+      }
+    } catch (InterruptedException e) {
+      throw new IllegalStateException(
+          "Thread interrupted while waiting for NDK libs to be loaded", e);
+    }
   }
 }