You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2015/12/18 16:09:40 UTC
nifi git commit: NIFI-1302 find dynamic libraries with standard names
Repository: nifi
Updated Branches:
refs/heads/master 04e960677 -> f239be289
NIFI-1302 find dynamic libraries with standard names
Signed-off-by: joewitt <jo...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f239be28
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f239be28
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f239be28
Branch: refs/heads/master
Commit: f239be289e280b1b7d458fbfe028944c089c2501
Parents: 04e9606
Author: Mike Moser <mo...@apache.org>
Authored: Thu Dec 17 18:12:36 2015 -0500
Committer: joewitt <jo...@apache.org>
Committed: Fri Dec 18 09:12:32 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/nifi/nar/NarClassLoader.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/f239be28/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java
index 3331fd2..8d55169 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoader.java
@@ -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