fix loading native libraries from build directory

woodser · Sep 14, 2024 · 1a55180 · 1a55180
1 parent 87117fb
commit 1a55180
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,12 @@
+{
+    "configurations": [
+        {
+            "type": "java",
+            "name": "Launch Current File",
+            "request": "launch",
+            "mainClass": "${file}",
+            "projectName": "monero-java",
+            "vmArgs": "-Djava.library.path=./build",
+        }
+    ]
+}
diff --git a/src/main/java/monero/common/MoneroUtils.java b/src/main/java/monero/common/MoneroUtils.java
@@ -60,6 +60,7 @@ public static void loadNativeLibrary() {
     try {
       String libName = (System.getProperty("os.name").toLowerCase().contains("windows") ? "lib" : "") + "monero-java";
       System.loadLibrary(libName);
+      if (isNativeLibraryLoaded()) return;
     } catch (Exception | UnsatisfiedLinkError e) {
       // ignore error
     }
@@ -93,13 +94,14 @@ public static void loadNativeLibrary() {
         libraryCppFile = "libmonero-cpp.dylib";
         libraryJavaFile = "libmonero-java.dylib";
       } else {
-        throw new UnsupportedOperationException("Unsupported operating system: " + osName);
+        throw new MoneroError("Unsupported operating system: " + osName);
       }
 
       // copy all library files to temp directory
       tempDir = Files.createTempDirectory("libmonero");
       for (String libraryFile : libraryFiles) {
         try (InputStream inputStream = MoneroUtils.class.getResourceAsStream(libraryPath + libraryFile); OutputStream outputStream = Files.newOutputStream(tempDir.resolve(libraryFile))) {
+          if (inputStream == null) throw new MoneroError("Missing native library for monero-java: " + libraryFile);
           byte[] buffer = new byte[1024];
           int bytesRead;
           while ((bytesRead = inputStream.read(buffer)) != -1) {