Use atomic flag if the native library is loaded or not

Hopefully addresses #295
luben · Dec 22, 2023 · c776e15 · c776e15
1 parent a3c3d7d
commit c776e15
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/main/java/com/github/luben/zstd/util/Native.java b/src/main/java/com/github/luben/zstd/util/Native.java
@@ -7,6 +7,7 @@
 import java.lang.UnsatisfiedLinkError;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public enum Native {
     ;
@@ -47,7 +48,7 @@ private static String resourceName() {
         return "/" + osName() + "/" + osArch() + "/" + libname + "." + libExtension();
     }
 
-    private static boolean loaded = false;
+    private static AtomicBoolean loaded = new AtomicBoolean(false);
 
     /**
      * Tell the library to assume the native library is already loaded.
@@ -56,11 +57,11 @@ private static String resourceName() {
      * zstd-jni to not attempt loading it again.
      */
     public static synchronized void assumeLoaded() {
-        loaded = true;
+        loaded.set(true);
     }
 
     public static synchronized boolean isLoaded() {
-        return loaded;
+        return loaded.get();
     }
 
     private static void loadLibrary(final String libName) {
@@ -86,7 +87,7 @@ public static synchronized void load() {
     }
 
     public static synchronized void load(final File tempFolder) {
-        if (loaded) {
+        if (loaded.get()) {
             return;
         }
         String resourceName = resourceName();
@@ -95,15 +96,15 @@ public static synchronized void load(final File tempFolder) {
         if (overridePath != null) {
             // Do not fall back to auto-discovery - consumers know better
             loadLibraryFile(overridePath);
-            loaded = true;
+            loaded.set(true);
             return;
         }
 
         // try to load the shared library directly from the JAR
         try {
             Class.forName("org.osgi.framework.BundleEvent"); // Simple OSGI env. check
             loadLibrary(libname);
-            loaded = true;
+            loaded.set(true);
             return;
         } catch (Throwable e) {
             // ignore both ClassNotFound and UnsatisfiedLinkError, and try other methods
@@ -115,7 +116,7 @@ public static synchronized void load(final File tempFolder) {
             // It also covers loading on Android.
             try {
                 loadLibrary(libnameShort);
-                loaded = true;
+                loaded.set(true);
                 return;
             } catch (UnsatisfiedLinkError e) {
                 UnsatisfiedLinkError err = new UnsatisfiedLinkError(e.getMessage() + "\n" + errorMsg);
@@ -163,7 +164,7 @@ public static synchronized void load(final File tempFolder) {
                     throw err;
                 }
             }
-            loaded = true;
+            loaded.set(true);
         } catch (IOException e) {
             // IO errors in extracting and writing the shared object in the temp dir
             ExceptionInInitializerError err = new ExceptionInInitializerError(