(SIGAR-141) sigar.jar location is not required to find native library

This commit is contained in:
Doug MacEachern committed 2009-03-27 15:07:56 -07:00
1 parent 6d6b5577b1
commit 68cf08cf4d
1 file changed
+12 -2
@@ -250,6 +250,11 @@ public class ArchLoader {
}
public String findJarPath(String libName)
throws ArchLoaderException {
return findJarPath(libName, true);
}
private String findJarPath(String libName, boolean isRequired)
throws ArchLoaderException {
/*
* native libraries should be installed along side
@@ -280,9 +285,14 @@ public class ArchLoader {
}
if (url == null) {
if (isRequired) {
throw new ArchLoaderException("Unable to find " +
getJarName());
}
else {
return null;
}
}
path = url.getFile();
@@ -385,11 +395,11 @@ public class ArchLoader {
if (path.equals("-")) {
return; //assume library is already loaded
}
findJarPath(null); //check for versioned .jar
findJarPath(null, false); //check for versioned .jar
findNativeLibrary(path, libName);
}
else {
if (findJarPath(libName) == null) {
if (findJarPath(libName, false) == null) {
findInJavaLibraryPath(libName);
}
}