Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-1302 find dynamic libraries with standard names 

Signed-off-by: joewitt <joewitt@apache.org>
This commit is contained in:
Mike Moser 2015-12-17 18:12:36 -05:00 committed by joewitt
parent 04e9606770
commit f239be289e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java
View File

@ -206,14 +206,15 @@ public class NarClassLoader extends URLClassLoader {
}
final File nativeDir = new File(dependencies, "native");
final File libsoFile = new File(nativeDir, "lib" + libname + ".so");
final File dllFile = new File(nativeDir, libname + ".dll");
final File soFile = new File(nativeDir, libname + ".so");
if (soFile.exists()) {
if (libsoFile.exists()) {
return libsoFile.getAbsolutePath();
} else if (dllFile.exists()) {
return dllFile.getAbsolutePath();
} else if (soFile.exists()) {
return soFile.getAbsolutePath();
} else {
final File dllFile = new File(nativeDir, libname + ".dll");
if (dllFile.exists()) {
return dllFile.getAbsolutePath();
}
}
// not found in the nar. try system native dir