tyler.durden
/
snappy-java
mirror of https://github.com/xerial/snappy-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

This commit is contained in:
Taro L. Saito 2011-08-01 17:16:23 +09:00
parent 331e7ef10b
commit 94b879fe12
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/org/xerial/snappy/SnappyLoader.java
View File

@ -37,7 +37,7 @@ import java.security.DigestInputStream;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
@ -186,8 +186,7 @@ public class SnappyLoader
try {
if (!useNativeCodeInjection) {
// Use the local loader
return Thread.currentThread().getContextClassLoader()
.loadClass(LocalSnappyNativeLoader.class.getName());
return LocalSnappyNativeLoader.class;
}
else {
// Use parent class loader to load SnappyNative, since Tomcat, which uses different class loaders for each webapps, cannot load JNI interface twice
@ -267,16 +266,16 @@ public class SnappyLoader
private static class LocalSnappyNativeLoader
{
// preserved for LocalSnappyNativeLoader
private static HashMap<String, Boolean> loadedLibFiles = new HashMap<String, Boolean>();
private static HashMap<String, Boolean> loadedLib = new HashMap<String, Boolean>();
private static HashSet<String> loadedLibFiles = new HashSet<String>();
private static HashSet<String> loadedLib = new HashSet<String>();
public static synchronized void load(String lib) {
if (loadedLibFiles.containsKey(lib))
if (loadedLibFiles.contains(lib))
return;
try {
System.load(lib);
loadedLibFiles.put(lib, true);
loadedLibFiles.add(lib);
}
catch (Exception e) {
e.printStackTrace();
@ -284,12 +283,12 @@ public class SnappyLoader
}
public static synchronized void loadLibrary(String libname) {
if (loadedLib.containsKey(libname))
if (loadedLib.contains(libname))
return;
try {
System.loadLibrary(libname);
loadedLib.put(libname, true);
loadedLib.add(libname);
}
catch (Exception e) {
e.printStackTrace();