summaryrefslogtreecommitdiffstats
path: root/src/java/com/jogamp/common/os
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-09-23 13:17:36 +0200
committerSven Gothel <[email protected]>2011-09-23 13:17:36 +0200
commit9da5bc1fe999caa924bd8dceafeff93ddf9d16a0 (patch)
tree54a0206d47b03d1d914bb55707b52b2cabd829b5 /src/java/com/jogamp/common/os
parent675ea2c9ee6308d439b2429d0863a634ba673eff (diff)
TempJarCache/JNILibLoaderBase: Validate the to be loader JarFile's Certificates if caller has any. Add Convenient JNILibLoaderBase.addNativeJarLibs(..) method.
Diffstat (limited to 'src/java/com/jogamp/common/os')
-rw-r--r--src/java/com/jogamp/common/os/Platform.java25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/java/com/jogamp/common/os/Platform.java b/src/java/com/jogamp/common/os/Platform.java
index 3627513..38635e1 100644
--- a/src/java/com/jogamp/common/os/Platform.java
+++ b/src/java/com/jogamp/common/os/Platform.java
@@ -285,22 +285,19 @@ public class Platform {
public Object run() {
if(TempJarCache.initSingleton()) {
try {
- URL jarUrlRoot = JarUtil.getJarURLDirname(
+ final URL jarUrlRoot = JarUtil.getJarURLDirname(
JarUtil.getJarURL(Platform.class.getName(), cl) );
- System.err.println("gluegen-rt: url-root "+jarUrlRoot);
- URL nativeJarURL = JarUtil.getJarURL(jarUrlRoot, nativeJarName);
- System.err.println("gluegen-rt: nativeJarURL "+nativeJarURL);
- JarFile nativeJar = JarUtil.getJarFile(nativeJarURL, cl);
- System.err.println("gluegen-rt: nativeJar "+nativeJar.getName());
- TempJarCache.bootstrapNativeLib(libBaseName, nativeJar);
- } catch (IOException ioe) {
- ioe.printStackTrace();
- }
- }
- DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false);
- return null;
+ final URL nativeJarURL = JarUtil.getJarURL(jarUrlRoot, nativeJarName);
+ final JarFile nativeJar = JarUtil.getJarFile(nativeJarURL, cl);
+ TempJarCache.bootstrapNativeLib(Platform.class, libBaseName, nativeJar);
+ } catch (IOException ioe) {
+ ioe.printStackTrace();
}
- });
+ }
+ DynamicLibraryBundle.GlueJNILibLoader.loadLibrary(libBaseName, false);
+ return null;
+ }
+ });
}
/**