Don't wait forever whilst trying to load the Native Library

Author: adamretter

java/src/main/java/org/rocksdb/RocksDB.java

@@ -84,15 +84,7 @@ public static void loadLibrary() {
       return;
     }
 
-    try {
-      while (libraryLoaded.get() == LibraryState.LOADING) {
-          Thread.sleep(10);
-      }
-    } catch (final InterruptedException e) {
-      // restore interrupted status
-      Thread.currentThread().interrupt();
-      throw new RuntimeException("Interrupted whilst trying to load the RocksDB shared library", e);
-    }
+    waitForLibraryToBeLoaded();
   }
 
   /**
@@ -148,9 +140,23 @@ public static void loadLibrary(final List<String> paths) {
       return;
     }
 
+    waitForLibraryToBeLoaded();
+  }
+
+  private static void waitForLibraryToBeLoaded() {
+    final long wait = 10; // Time to wait before re-checking if another thread loaded the library
+    final long timeout =
+        10 * 1000; // Maximum time to wait for another thread to load the library (10 seconds)
+    long waited = 0;
     try {
       while (libraryLoaded.get() == LibraryState.LOADING) {
-          Thread.sleep(10);
+        Thread.sleep(wait);
+        waited += wait;
+
+        if (waited >= timeout) {
+          throw new RuntimeException(
+              "Exceeded timeout whilst trying to load the RocksDB shared library");
+        }
       }
     } catch (final InterruptedException e) {
       // restore interrupted status