Repository: accumulo Updated Branches: refs/heads/1.6 d26f63fda -> 65a8c1a16 refs/heads/master 47a091ade -> 07e74151b
ACCUMULO-3481 libaccumulo.so from java.library.path if libaccumulo.so was loaded from java.library.path, NativeMap.isLoaded() returns false, and native lib is not used Signed-off-by: Christopher Tubbs <ctubb...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/65a8c1a1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/65a8c1a1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/65a8c1a1 Branch: refs/heads/1.6 Commit: 65a8c1a16826cb467da5ba9445978864b8fe73fc Parents: d26f63f Author: volth <vo...@webmaster.ms> Authored: Mon Jan 12 01:45:53 2015 +0000 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Thu Jan 15 11:07:55 2015 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/tserver/NativeMap.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/65a8c1a1/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java index dcd242e..f728a9b 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java @@ -78,6 +78,7 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> { String errMsg = "Tried and failed to load native map library from " + ldLibraryPath; try { System.loadLibrary("accumulo"); + loadedNativeLibraries.set(true); log.info("Loaded native map shared library from " + ldLibraryPath); } catch (Exception e) { log.error(errMsg, e);
