Skip to content

Commit a1ec69f

Browse files
authored
Merge pull request #1183 from sappo/master
Problem: Some libraries might not get loaded from jar if another lib …
2 parents feb1da9 + 03683c6 commit a1ec69f

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

zproject_java.gsl

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,7 @@ $(project.GENERATED_WARNING_HEADER:)
763763
*/
764764
package org.zeromq.$(project.prefix:c);
765765

766+
import java.util.stream.Stream;
766767
import org.scijava.nativelib.NativeLoader;
767768
. for project.use
768769
. if count (project->dependencies.class, class.project = use.project) > 0
@@ -779,14 +780,19 @@ implements AutoCloseable\
779780
if (System.getProperty("java.vm.vendor").contains("Android")) {
780781
System.loadLibrary("$(project.prefix:c)jni");
781782
} else {
782-
try {
783+
Stream.of(
783784
. for project.use
784-
NativeLoader.loadLibrary("$(use.prefix:c)");
785+
"$(use.prefix:c)",
785786
. endfor
786-
NativeLoader.loadLibrary("$(project.prefix:c)");
787-
} catch (Exception e) {
788-
System.err.println("[WARN] " + e.getMessage() +" from jar. Assuming it is installed on the system.");
789-
}
787+
"$(project.prefix:c)"
788+
)
789+
.forEach(lib -> {
790+
try {
791+
NativeLoader.loadLibrary(lib);
792+
} catch (Exception e) {
793+
System.err.println("[WARN] " + e.getMessage() +" from jar. Assuming it is installed on the system.");
794+
}
795+
});
790796
try {
791797
NativeLoader.loadLibrary("$(project.prefix:c)jni");
792798
} catch (Exception e) {

0 commit comments

Comments
 (0)