aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-04-03 01:02:27 +0200
committerSven Gothel <[email protected]>2019-04-03 01:02:27 +0200
commit1fe5a5dc1b164789253406286a05d1332b9467b9 (patch)
tree690f3e18bc81b4ae4f8be9350389c8d17fc44c9d
parent31869130c3580a1a1c9e2f57e48d5712a3eebda1 (diff)
Bug 1367: Adapt to TempFileCache & TempJarCache Changes
-rw-r--r--src/jogl/classes/com/jogamp/opengl/GLProfile.java2
-rw-r--r--src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java2
-rw-r--r--src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java2
-rw-r--r--src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java2
-rw-r--r--src/newt/classes/jogamp/newt/NEWTJNILibLoader.java2
5 files changed, 5 insertions, 5 deletions
diff --git a/src/jogl/classes/com/jogamp/opengl/GLProfile.java b/src/jogl/classes/com/jogamp/opengl/GLProfile.java
index 520db78ad..e19535e5d 100644
--- a/src/jogl/classes/com/jogamp/opengl/GLProfile.java
+++ b/src/jogl/classes/com/jogamp/opengl/GLProfile.java
@@ -218,7 +218,7 @@ public class GLProfile {
public Object run() {
Platform.initSingleton();
- if(TempJarCache.isInitialized()) {
+ if( TempJarCache.isInitialized(true) ) {
final ClassLoader cl = GLProfile.class.getClassLoader();
final String newtDebugClassName = "jogamp.newt.Debug";
final Class<?>[] classesFromJavaJars = new Class<?>[] { jogamp.nativewindow.Debug.class, jogamp.opengl.Debug.class, null };
diff --git a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java
index d3f4c002d..5e6338b5c 100644
--- a/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java
+++ b/src/jogl/classes/com/jogamp/opengl/cg/CgDynamicLibraryBundleInfo.java
@@ -47,7 +47,7 @@ public final class CgDynamicLibraryBundleInfo implements DynamicLibraryBundleInf
public Object run() {
Platform.initSingleton();
- if(TempJarCache.isInitialized()) {
+ if( TempJarCache.isInitialized(true) ) {
// only: jogl-cg.jar -> jogl-cg-natives-<os.and.arch>.jar [atomic JAR files only]
JNILibLoaderBase.addNativeJarLibs(new Class<?>[] { jogamp.opengl.cg.CgPackagePlaceholder.class }, null);
}
diff --git a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java
index f52292769..78140df6f 100644
--- a/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java
+++ b/src/jogl/classes/jogamp/graph/font/UbuntuFontLoader.java
@@ -136,7 +136,7 @@ public class UbuntuFontLoader implements FontSet {
if( !attemptedJARLoading ) {
attemptedJARLoading = true;
Platform.initSingleton();
- if( TempJarCache.isInitialized() ) {
+ if( TempJarCache.isInitialized(false) ) {
try {
final Uri uri = JarUtil.getRelativeOf(UbuntuFontLoader.class, jarSubDir, jarName);
final Exception e0 = AccessController.doPrivileged(new PrivilegedAction<Exception>() {
diff --git a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
index 8d0d04161..1284974bf 100644
--- a/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
+++ b/src/nativewindow/classes/jogamp/nativewindow/NWJNILibLoader.java
@@ -43,7 +43,7 @@ public class NWJNILibLoader extends JNILibLoaderBase {
public Boolean run() {
Platform.initSingleton();
final String libName = "nativewindow_"+ossuffix ;
- if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) {
+ if( TempJarCache.isInitialized(true) && null == TempJarCache.findLibrary(libName) ) {
JNILibLoaderBase.addNativeJarLibsJoglCfg(new Class<?>[] { jogamp.nativewindow.Debug.class });
}
return Boolean.valueOf(loadLibrary(libName, false, NWJNILibLoader.class.getClassLoader()));
diff --git a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java
index 793fbf9b0..84e2167ee 100644
--- a/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java
+++ b/src/newt/classes/jogamp/newt/NEWTJNILibLoader.java
@@ -53,7 +53,7 @@ public class NEWTJNILibLoader extends JNILibLoaderBase {
public Boolean run() {
Platform.initSingleton();
final String libName = "newt";
- if(TempJarCache.isInitialized() && null == TempJarCache.findLibrary(libName)) {
+ if( TempJarCache.isInitialized(true) && null == TempJarCache.findLibrary(libName) ) {
JNILibLoaderBase.addNativeJarLibsJoglCfg(new Class<?>[] { jogamp.nativewindow.Debug.class, jogamp.newt.Debug.class });
}
return Boolean.valueOf(loadLibrary(libName, false, NEWTJNILibLoader.class.getClassLoader()));