From 29a40071b4f0cbac11efc7758506e092960e6c53 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 8 May 2026 17:26:39 -0500 Subject: [PATCH] Try loading binaries from library path --- .../com/etebase/client/internal/NativeLoader.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/client-jvm/src/main/java/com/etebase/client/internal/NativeLoader.java b/client-jvm/src/main/java/com/etebase/client/internal/NativeLoader.java index 0b952e7..7d2b0c8 100644 --- a/client-jvm/src/main/java/com/etebase/client/internal/NativeLoader.java +++ b/client-jvm/src/main/java/com/etebase/client/internal/NativeLoader.java @@ -24,13 +24,22 @@ public static void load() { String override = System.getProperty(OVERRIDE_PROPERTY); if (override != null && !override.isEmpty()) { System.load(override); - } else { + } else if (!loadFromLibraryPath()) { loadFromClasspath(); } loaded = true; } } + private static boolean loadFromLibraryPath() { + try { + System.loadLibrary(LIB_NAME); + return true; + } catch (UnsatisfiedLinkError ignored) { + return false; + } + } + private static void loadFromClasspath() { String os = detectOs(); String arch = detectArch();