sparrowwallet/usb4java
sparrowwallet/usb4java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mark as loaded BEFORE loading to prevent recursive loading.

Browse Source 
When load method is called by usb4java-javax then the loading of the
JNI library (Triggered by the load method) triggers the load method
again. This results in a crash. Setting the loaded flag before loading
the JNI lib prevents this.
This commit is contained in:
Klaus Reimer 2014-02-23 17:23:25 +01:00
parent 03efe3683a
commit 649be57dc2
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/usb4java/Loader.java
View File

@ -339,13 +339,15 @@ public final class Loader
* @throws LoaderException
* When loading the native wrapper libraries failed.
*/
public static void load()
public synchronized static void load()
{
// Do nothing if already loaded (or still loading)
if (loaded)
{
return;
}
loaded = true;
final String platform = getPlatform();
final String lib = getLibName();
final String extraLib = getExtraLibName();
@ -354,6 +356,5 @@ public final class Loader
System.load(extractLibrary(platform, extraLib));
}
System.load(extractLibrary(platform, lib));
loaded = true;
}
}