From fe853909891c52f439b352fe8bc3a349ac7d64e9 Mon Sep 17 00:00:00 2001 From: "Taro L. Saito" Date: Tue, 16 Aug 2011 13:14:48 +0900 Subject: [PATCH] Fix commend on loading libsnappyjava --- .../java/org/xerial/snappy/SnappyLoader.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/xerial/snappy/SnappyLoader.java b/src/main/java/org/xerial/snappy/SnappyLoader.java index a361ac7..b0dfffa 100755 --- a/src/main/java/org/xerial/snappy/SnappyLoader.java +++ b/src/main/java/org/xerial/snappy/SnappyLoader.java @@ -54,13 +54,15 @@ import java.util.Properties; * This SnappyLoader searches for native libraries (snappyjava.dll, * libsnappy.so, etc.) in the following order: *
    + *
  1. If system property org.xerial.snappy.use.systemlib is set to true, + * lookup folders specified by java.lib.path system property (This is the + * default path that JVM searches for native libraries) *
  2. (System property: org.xerial.snappy.lib.path)/(System property: * org.xerial.lib.name) *
  3. One of the libraries embedded in snappy-java-(version).jar extracted into - * (System property: java.io.tempdir or if - * org.xerial.snappy.tempdir is set, use this folder.) - *
  4. Folders specified by java.lib.path system property (This is the default - * path that JVM searches for native libraries) + * (System property: java.io.tempdir). If + * org.xerial.snappy.tempdir is set, use this folder instead of + * java.io.tempdir. *
* *

@@ -132,10 +134,9 @@ public class SnappyLoader } /** - * Load SnappyNative and its JNI native implementation in the root class - * loader. This process is necessary to avoid the JNI multi-loading issue - * when the same JNI library is loaded by different class loaders in the - * same JVM. + * Load SnappyNative and its JNI native implementation using the root class + * loader. This hack is for avoiding the JNI multi-loading issue when the + * same JNI library is loaded by different class loaders. * * In order to load native code in the root class loader, this method first * inject SnappyNativeLoader class into the root class loader, because