diff options
| author | Sven Gothel <[email protected]> | 2013-10-01 15:34:05 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-10-01 15:34:05 +0200 |
| commit | b05f716cbcbc379588050c8f3d91579b3a14ec88 (patch) | |
| tree | 6bb720e5dc500225d4a12bf3b6dc93f4d85f04fb /src/java/com/jogamp/common/util/cache | |
| parent | 4aa1478b2e4f1401b08d093461b37a14c9501c29 (diff) | |
Bug 845: Fix JNILibLoaderBase.addNativeJarLibsImpl(..) fat-jar case.
Always use the jar-basename when calling TempJarCache.addNativeLibs(..),
otherwise it is mapped and loaded multiple times leading to different native libraries.
Simplify addNativeJarLibsImpl(..) argument semantics by passing complete jarBasename
and nativeJarBasename (w/ suffix).
Added manual test scripts validating [gluegen + jogl] usage
with multi (Bug 843) and fat (Bug 845) jar configurations.
Diffstat (limited to 'src/java/com/jogamp/common/util/cache')
| -rw-r--r-- | src/java/com/jogamp/common/util/cache/TempJarCache.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/java/com/jogamp/common/util/cache/TempJarCache.java b/src/java/com/jogamp/common/util/cache/TempJarCache.java index e2a33e0..ecf6e56 100644 --- a/src/java/com/jogamp/common/util/cache/TempJarCache.java +++ b/src/java/com/jogamp/common/util/cache/TempJarCache.java @@ -210,13 +210,16 @@ public class TempJarCache { nativeLibJars.put(jarURI, LoadState.LOOKED_UP); final JarFile jarFile = JarUtil.getJarFile(jarURI); if(DEBUG) { - System.err.println("TempJarCache: addNativeLibs: "+jarURI+": nativeJar "+jarFile.getName()); + System.err.println("TempJarCache: addNativeLibs: "+jarURI+": nativeJar "+jarFile.getName()+" (NEW)"); } validateCertificates(certClass, jarFile); final int num = JarUtil.extract(tmpFileCache.getTempDir(), nativeLibMap, jarFile, nativeLibraryPath, true, false, false); nativeLibJars.put(jarURI, LoadState.LOADED); return num > 0; } else if( testLoadState(nativeLibJarsLS, LoadState.LOADED) ) { + if(DEBUG) { + System.err.println("TempJarCache: addNativeLibs: "+jarURI+": nativeJar "+jarURI+" (REUSE)"); + } return true; } throw new IOException("TempJarCache: addNativeLibs: "+jarURI+", previous load attempt failed"); |