Thread-safe initialisation

blockchain · Oct 27, 2020 · ac40869 · ac40869
1 parent 3cc9102
commit ac40869
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 9 deletions.
diff --git a/jni/build.gradle b/jni/build.gradle
@@ -15,7 +15,7 @@ plugins {
 }
 
 group 'com.blockchain'
-version '1.0.2'
+version '1.0.3'
 
 apply plugin: 'maven-publish'
 apply plugin: 'maven'

diff --git a/jni/java/wallet/core/java/AnySigner.java b/jni/java/wallet/core/java/AnySigner.java
@@ -25,14 +25,25 @@ public class AnySigner {
     private static boolean isInitialized = false;
 
     public static void initialize() {
-        // Load the static library from the resource path somehow...
-        try {
-            tempDirWithPrefix = Files.createTempDirectory(tempFolderPrefix);
-            String resourceName = getResourceName();
-            String resourcePath = writeResourceToFile(resourceName);
-            System.load(resourcePath);
-        } catch (Exception e) {
-            e.printStackTrace();
+        if(isInitialized) {
+            return;
+        }
+
+        synchronized (tempFolderPrefix) {
+            if(isInitialized) {
+                return;
+            }
+
+            // Load the static library from the resource path somehow...
+            try {
+                tempDirWithPrefix = Files.createTempDirectory(tempFolderPrefix);
+                String resourceName = getResourceName();
+                String resourcePath = writeResourceToFile(resourceName);
+                System.load(resourcePath);
+            } catch (Exception e) {
+                System.out.println("Unable to load static library, " + e.getMessage());
+                e.printStackTrace();
+            }
         }
     }