diff options
Diffstat (limited to 'src/java/com/jogamp/common/util')
| -rw-r--r-- | src/java/com/jogamp/common/util/IOUtil.java | 12 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/util/JarUtil.java | 287 | ||||
| -rw-r--r-- | src/java/com/jogamp/common/util/cache/TempJarCache.java | 174 |
3 files changed, 290 insertions, 183 deletions
diff --git a/src/java/com/jogamp/common/util/IOUtil.java b/src/java/com/jogamp/common/util/IOUtil.java index 8c2a0c1..ffea7cb 100644 --- a/src/java/com/jogamp/common/util/IOUtil.java +++ b/src/java/com/jogamp/common/util/IOUtil.java @@ -338,19 +338,23 @@ public class IOUtil { } } - public static String getClassFileName(String clazzBinName) throws IOException { + public static String getClassFileName(String clazzBinName) { // or return clazzBinName.replace('.', File.separatorChar) + ".class"; ? return clazzBinName.replace('.', '/') + ".class"; } /** * @param clazzBinName com.jogamp.common.util.cache.TempJarCache - * @param cl + * @param cl ClassLoader to locate the JarFile * @return jar:file:/usr/local/projects/JOGL/gluegen/build-x86_64/gluegen-rt.jar!/com/jogamp/common/util/cache/TempJarCache.class - * @throws IOException + * @throws IOException if the jar file could not been found by the ClassLoader */ public static URL getClassURL(String clazzBinName, ClassLoader cl) throws IOException { - return cl.getResource(getClassFileName(clazzBinName)); + final URL url = cl.getResource(getClassFileName(clazzBinName)); + if(null == url) { + throw new IOException("Cannot not find: "+clazzBinName); + } + return url; } /** diff --git a/src/java/com/jogamp/common/util/JarUtil.java b/src/java/com/jogamp/common/util/JarUtil.java index 85a10ce..84ec59d 100644 --- a/src/java/com/jogamp/common/util/JarUtil.java +++ b/src/java/com/jogamp/common/util/JarUtil.java @@ -35,6 +35,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.net.JarURLConnection; +import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; import java.security.cert.Certificate; @@ -81,125 +82,161 @@ public class JarUtil { * </p> * * @param clazzBinName "com.jogamp.common.GlueGenVersion" - * @param cl + * @param cl ClassLoader to locate the JarFile * @return "jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class" - * @throws IllegalArgumentException if the URL doesn't match the expected formatting - * @throws IOException + * @throws IllegalArgumentException if the URL doesn't match the expected formatting or null arguments + * @throws IOException if the class's Jar file could not been found by the ClassLoader * @see {@link IOUtil#getClassURL(String, ClassLoader)} */ public static URL getJarURL(String clazzBinName, ClassLoader cl) throws IllegalArgumentException, IOException { - URL url = IOUtil.getClassURL(clazzBinName, cl); - if(null != url) { - String urlS = url.toExternalForm(); - if(DEBUG) { - System.out.println("getJarURL "+url+", extForm: "+urlS); - } - if(!urlS.startsWith("jar:")) { - throw new IllegalArgumentException("JAR URL doesn't start with 'jar:', got <"+urlS+">"); - } + if(null == clazzBinName || null == cl) { + throw new IllegalArgumentException("null arguments: clazzBinName "+clazzBinName+", cl "+cl); + } + final URL url = IOUtil.getClassURL(clazzBinName, cl); + // test name .. + final String urlS = url.toExternalForm(); + if(DEBUG) { + System.out.println("getJarURL "+url+", extForm: "+urlS); + } + if(!urlS.startsWith("jar:")) { + throw new IllegalArgumentException("JAR URL doesn't start with 'jar:', got <"+urlS+">"); } return url; } /** - * The Class's <code>"com.jogamp.common.GlueGenVersion"</code> - * URL <code>jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class"</code> + * The Class's Jar URL <code>jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class</code> * Jar basename <code>gluegen-rt.jar</code> will be returned. * <p> * <i>sub_protocol</i> may be "file", "http", etc.. * </p> * - * @param clazzBinName "com.jogamp.common.GlueGenVersion" + * @param classJarURL as retrieved w/ {@link #getJarURL(String, ClassLoader) getJarURL("com.jogamp.common.GlueGenVersion", cl)}, + * i.e. <code>jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class</code> + * @return <code>gluegen-rt.jar</code> + * @throws IllegalArgumentException if the URL doesn't match the expected formatting or is null + * @see {@link IOUtil#getClassURL(String, ClassLoader)} + */ + public static String getJarBasename(URL classJarURL) throws IllegalArgumentException { + if(null == classJarURL) { + throw new IllegalArgumentException("URL is null"); + } + String urlS = classJarURL.toExternalForm(); + urlS = urlS.substring(4, urlS.length()); // exclude 'jar:' + + // from + // file:/some/path/gluegen-rt.jar!/com/jogamp/common/util/cache/TempJarCache.class + // to + // file:/some/path/gluegen-rt.jar + int idx = urlS.lastIndexOf('!'); + if (0 <= idx) { + urlS = urlS.substring(0, idx); // exclude '!/' + } else { + throw new IllegalArgumentException("JAR URL does not contain jar url terminator '!', in <"+classJarURL.toExternalForm()+">, got <"+urlS+">"); + } + + // from + // file:/some/path/gluegen-rt.jar + // to + // gluegen-rt.jar + idx = urlS.lastIndexOf('/'); + if(0 > idx) { + // no abs-path, check for protocol terminator ':' + idx = urlS.lastIndexOf(':'); + if(0 > idx) { + throw new IllegalArgumentException("JAR URL does not contain protocol terminator ':', in <"+classJarURL.toExternalForm()+">, got <"+urlS+">"); + } + } + urlS = urlS.substring(idx+1); // just the jar name + + if(0 >= urlS.lastIndexOf(".jar")) { + throw new IllegalArgumentException("No Jar name in <"+classJarURL.toExternalForm()+">, got <"+urlS+">"); + } + if(DEBUG) { + System.out.println("getJarName res: "+urlS); + } + return urlS; + } + + /** + * The Class's <code>com.jogamp.common.GlueGenVersion</code> + * URL <code>jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class</code> + * Jar basename <code>gluegen-rt.jar</code> will be returned. + * <p> + * <i>sub_protocol</i> may be "file", "http", etc.. + * </p> + * + * @param clazzBinName <code>com.jogamp.common.GlueGenVersion</code> * @param cl - * @return "gluegen-rt.jar" + * @return <code>gluegen-rt.jar</code> * @throws IllegalArgumentException if the URL doesn't match the expected formatting - * @throws IOException + * @throws IOException if the class's Jar file could not been found by the ClassLoader * @see {@link IOUtil#getClassURL(String, ClassLoader)} */ public static String getJarBasename(String clazzBinName, ClassLoader cl) throws IllegalArgumentException, IOException { - URL url = getJarURL(clazzBinName, cl); - if(null != url) { - String urlS = url.toExternalForm(); - urlS = urlS.substring(4, urlS.length()); // exclude 'jar:' - - // from - // file:/some/path/gluegen-rt.jar!/com/jogamp/common/util/cache/TempJarCache.class - // to - // file:/some/path/gluegen-rt.jar - int idx = urlS.lastIndexOf('!'); - if (0 <= idx) { - urlS = urlS.substring(0, idx); // exclude '!/' - } else { - throw new IllegalArgumentException("JAR URL does not contain jar url terminator '!', in <"+url.toExternalForm()+">, got <"+urlS+">"); - } - - // from - // file:/some/path/gluegen-rt.jar - // to - // gluegen-rt.jar - idx = urlS.lastIndexOf('/'); - if(0 > idx) { - // no abs-path, check for protocol terminator ':' - idx = urlS.lastIndexOf(':'); - if(0 > idx) { - throw new IllegalArgumentException("JAR URL does not contain protocol terminator ':', in <"+url.toExternalForm()+">, got <"+urlS+">"); - } - } - urlS = urlS.substring(idx+1); // just the jar name - - if(0 >= urlS.lastIndexOf(".jar")) { - throw new IllegalArgumentException("No Jar name in <"+url.toExternalForm()+">, got <"+urlS+">"); - } - if(DEBUG) { - System.out.println("getJarName res: "+urlS); - } - return urlS; + return getJarBasename(getJarURL(clazzBinName, cl)); + } + + /** + * The Class's Jar URL <code>jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class</code> + * Jar file's sub URL <code><i>sub_protocol</i>:/some/path/gluegen-rt.jar</code> will be returned. + * <p> + * <i>sub_protocol</i> may be "file", "http", etc.. + * </p> + * + * @param classJarURL as retrieved w/ {@link #getJarURL(String, ClassLoader) getJarURL("com.jogamp.common.GlueGenVersion", cl)}, + * i.e. <code>jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class</code> + * @param cl + * @return <code><i>sub_protocol</i>:/some/path/gluegen-rt.jar</code> + * @throws IllegalArgumentException if the URL doesn't match the expected formatting or is null + * @throws MalformedURLException if the computed URL specifies an unknown protocol + * @see {@link IOUtil#getClassURL(String, ClassLoader)} + */ + public static URL getJarSubURL(URL classJarURL) throws IllegalArgumentException, MalformedURLException { + if(null == classJarURL) { + throw new IllegalArgumentException("URL is null"); } - return null; + String urlS = classJarURL.toExternalForm(); + urlS = urlS.substring(4, urlS.length()); // exclude 'jar:' + + // from + // file:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class + // to + // file:/some/path/gluegen-rt.jar + int idx = urlS.lastIndexOf('!'); + if (0 <= idx) { + urlS = urlS.substring(0, idx); // exclude '!/' + } else { + throw new IllegalArgumentException("JAR URL does not contain jar url terminator '!', url <"+urlS+">"); + } + + if(0 >= urlS.lastIndexOf(".jar")) { + throw new IllegalArgumentException("No Jar name in <"+classJarURL.toExternalForm()+">, got <"+urlS+">"); + } + if(DEBUG) { + System.out.println("getJarSubURL res: "+urlS); + } + return new URL(urlS); } /** - * The Class's <code>"com.jogamp.common.GlueGenVersion"</code> - * URL <code>jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class"</code> + * The Class's <code>com.jogamp.common.GlueGenVersion</code> + * URL <code>jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class</code> * Jar file's sub URL <code><i>sub_protocol</i>:/some/path/gluegen-rt.jar</code> will be returned. * <p> * <i>sub_protocol</i> may be "file", "http", etc.. * </p> * - * @param clazzBinName "com.jogamp.common.GlueGenVersion" + * @param clazzBinName <code>com.jogamp.common.GlueGenVersion</code> * @param cl - * @return "<i>sub_protocol</i>:/some/path/gluegen-rt.jar" + * @return <code><i>sub_protocol</i>:/some/path/gluegen-rt.jar</code> * @throws IllegalArgumentException if the URL doesn't match the expected formatting - * @throws IOException + * @throws IOException if the class's Jar file could not been found by the ClassLoader * @see {@link IOUtil#getClassURL(String, ClassLoader)} */ public static URL getJarSubURL(String clazzBinName, ClassLoader cl) throws IllegalArgumentException, IOException { - URL url = getJarURL(clazzBinName, cl); - if(null != url) { - String urlS = url.toExternalForm(); - urlS = urlS.substring(4, urlS.length()); // exclude 'jar:' - - // from - // file:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class - // to - // file:/some/path/gluegen-rt.jar - int idx = urlS.lastIndexOf('!'); - if (0 <= idx) { - urlS = urlS.substring(0, idx); // exclude '!/' - } else { - throw new IllegalArgumentException("JAR URL does not contain jar url terminator '!', url <"+urlS+">"); - } - - if(0 >= urlS.lastIndexOf(".jar")) { - throw new IllegalArgumentException("No Jar name in <"+url.toExternalForm()+">, got <"+urlS+">"); - } - if(DEBUG) { - System.out.println("getJarSubURL res: "+urlS); - } - return new URL(urlS); - } - return null; + return getJarSubURL(getJarURL(clazzBinName, cl)); } /** @@ -213,20 +250,20 @@ public class JarUtil { * @param clazzBinName "com.jogamp.common.GlueGenVersion" * @param cl * @return "jar:<i>sub_protocol</i>:/some/path/gluegen-rt.jar!/" - * @throws IllegalArgumentException if the URL doesn't match the expected formatting - * @throws IOException + * @throws IllegalArgumentException if the URL doesn't match the expected formatting or null arguments + * @throws IOException if the class's Jar file could not been found by the ClassLoader * @see {@link IOUtil#getClassURL(String, ClassLoader)} */ public static URL getJarFileURL(String clazzBinName, ClassLoader cl) throws IllegalArgumentException, IOException { + if(null == clazzBinName || null == cl) { + throw new IllegalArgumentException("null arguments: clazzBinName "+clazzBinName+", cl "+cl); + } URL url = getJarSubURL(clazzBinName, cl); - if(null != url) { - url = new URL("jar:"+url.toExternalForm()+"!/"); - if(DEBUG) { - System.out.println("getJarFileURL res: "+url); - } - return url; + url = new URL("jar:"+url.toExternalForm()+"!/"); + if(DEBUG) { + System.out.println("getJarFileURL res: "+url); } - return null; + return url; } /** @@ -238,10 +275,13 @@ public class JarUtil { * * @param aURL "<i>protocol</i>:/some/path/gluegen-rt.jar" * @return "<i>protocol</i>:/some/path/" - * @throws IllegalArgumentException if the URL doesn't match the expected formatting - * @throws IOException + * @throws IllegalArgumentException if the URL doesn't match the expected formatting, or is null + * @throws MalformedURLException */ - public static URL getURLDirname(URL aURL) throws IllegalArgumentException, IOException { + public static URL getURLDirname(URL aURL) throws IllegalArgumentException, MalformedURLException { + if(null == aURL) { + throw new IllegalArgumentException("URL is null"); + } String urlS = aURL.toExternalForm(); if(DEBUG) { System.out.println("getURLDirname "+aURL+", extForm: "+urlS); @@ -270,11 +310,12 @@ public class JarUtil { * @param baseUrl file:/some/path/ * @param jarFileName gluegen-rt.jar * @return jar:file:/some/path/gluegen-rt.jar!/ - * @throws IOException + * @throws MalformedURLException + * @throws IllegalArgumentException null arguments */ - public static URL getJarFileURL(URL baseUrl, String jarFileName) throws IOException { - if(null == jarFileName) { - throw new IllegalArgumentException("jarFileName is null"); + public static URL getJarFileURL(URL baseUrl, String jarFileName) throws IOException, MalformedURLException { + if(null == baseUrl || null == jarFileName) { + throw new IllegalArgumentException("null arguments: baseUrl "+baseUrl+", jarFileName "+jarFileName); } return new URL("jar:"+baseUrl.toExternalForm()+jarFileName+"!/"); } @@ -282,9 +323,10 @@ public class JarUtil { /** * @param jarSubUrl file:/some/path/gluegen-rt.jar * @return jar:file:/some/path/gluegen-rt.jar!/ - * @throws IOException + * @throws MalformedURLException + * @throws IllegalArgumentException null arguments */ - public static URL getJarFileURL(URL jarSubUrl) throws IOException { + public static URL getJarFileURL(URL jarSubUrl) throws MalformedURLException, IllegalArgumentException { if(null == jarSubUrl) { throw new IllegalArgumentException("jarSubUrl is null"); } @@ -295,9 +337,10 @@ public class JarUtil { * @param jarFileURL jar:file:/some/path/gluegen-rt.jar!/ * @param jarEntry com/jogamp/common/GlueGenVersion.class * @return jar:file:/some/path/gluegen-rt.jar!/com/jogamp/common/GlueGenVersion.class - * @throws IOException + * @throws MalformedURLException + * @throws IllegalArgumentException null arguments */ - public static URL getJarEntryURL(URL jarFileURL, String jarEntry) throws IOException { + public static URL getJarEntryURL(URL jarFileURL, String jarEntry) throws MalformedURLException, IllegalArgumentException { if(null == jarEntry) { throw new IllegalArgumentException("jarEntry is null"); } @@ -308,33 +351,35 @@ public class JarUtil { * @param clazzBinName com.jogamp.common.util.cache.TempJarCache * @param cl domain * @return JarFile containing the named class within the given ClassLoader - * @throws IOException + * @throws IOException if the class's Jar file could not been found by the ClassLoader + * @throws IllegalArgumentException null arguments * @see {@link #getJarFileURL(String, ClassLoader)} */ - public static JarFile getJarFile(String clazzBinName, ClassLoader cl) throws IOException { - return getJarFile(getJarFileURL(clazzBinName, cl), cl); + public static JarFile getJarFile(String clazzBinName, ClassLoader cl) throws IOException, IllegalArgumentException { + return getJarFile(getJarFileURL(clazzBinName, cl)); } /** * @param jarFileURL jar:file:/some/path/gluegen-rt.jar!/ - * @param cl domain * @return JarFile as named by URL within the given ClassLoader - * @throws IOException + * @throws IllegalArgumentException null arguments + * @throws IOException if the Jar file could not been found */ - public static JarFile getJarFile(URL jarFileUrl, ClassLoader cl) throws IOException { + public static JarFile getJarFile(URL jarFileUrl) throws IOException, IllegalArgumentException { + if(null == jarFileUrl) { + throw new IllegalArgumentException("null jarFileUrl"); + } if(DEBUG) { System.out.println("getJarFile: "+jarFileUrl); } - if(null != jarFileUrl) { - URLConnection urlc = jarFileUrl.openConnection(); - if(urlc instanceof JarURLConnection) { - JarURLConnection jarConnection = (JarURLConnection)jarFileUrl.openConnection(); - JarFile jarFile = jarConnection.getJarFile(); - if(DEBUG) { - System.out.println("getJarFile res: "+jarFile.getName()); - } - return jarFile; - } + URLConnection urlc = jarFileUrl.openConnection(); + if(urlc instanceof JarURLConnection) { + JarURLConnection jarConnection = (JarURLConnection)jarFileUrl.openConnection(); + JarFile jarFile = jarConnection.getJarFile(); + if(DEBUG) { + System.out.println("getJarFile res: "+jarFile.getName()); + } + return jarFile; } if(DEBUG) { System.out.println("getJarFile res: NULL"); diff --git a/src/java/com/jogamp/common/util/cache/TempJarCache.java b/src/java/com/jogamp/common/util/cache/TempJarCache.java index e4a77fe..6f24c68 100644 --- a/src/java/com/jogamp/common/util/cache/TempJarCache.java +++ b/src/java/com/jogamp/common/util/cache/TempJarCache.java @@ -39,9 +39,7 @@ import java.net.URL; import java.security.cert.Certificate; import java.util.Enumeration; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; -import java.util.Set; import java.util.jar.JarEntry; import java.util.jar.JarFile; @@ -62,10 +60,24 @@ public class TempJarCache { // unpacked library file in nativeTmpDir. private static Map<String, String> nativeLibMap; - // Set of native jar files added - private static Set<URL> nativeLibJars; - private static Set<URL> classFileJars; - private static Set<URL> resourceFileJars; + public enum LoadState { + LOOKED_UP, LOADED; + + public boolean compliesWith(LoadState o2) { + return null != o2 ? compareTo(o2) >= 0 : false; + } + } + private static boolean testLoadState(LoadState has, LoadState exp) { + if(null == has) { + return null == exp; + } + return has.compliesWith(exp); + } + + // Set of jar files added + private static Map<URL, LoadState> nativeLibJars; + private static Map<URL, LoadState> classFileJars; + private static Map<URL, LoadState> resourceFileJars; private static TempFileCache tmpFileCache; @@ -92,9 +104,9 @@ public class TempJarCache { if(!staticInitError) { // Initialize the collections of resources nativeLibMap = new HashMap<String, String>(); - nativeLibJars = new HashSet<URL>(); - classFileJars = new HashSet<URL>(); - resourceFileJars = new HashSet<URL>(); + nativeLibJars = new HashMap<URL, LoadState>(); + classFileJars = new HashMap<URL, LoadState>(); + resourceFileJars = new HashMap<URL, LoadState>(); } if(DEBUG) { System.err.println("TempJarCache.initSingleton(): ok "+(false==staticInitError)+", "+ tmpFileCache.getTempDir()); @@ -163,28 +175,28 @@ public class TempJarCache { return tmpFileCache; } - public static boolean containsNativeLibs(URL jarURL) throws IOException { + public synchronized static boolean checkNativeLibs(URL jarURL, LoadState exp) throws IOException { checkInitialized(); if(null == jarURL) { throw new IllegalArgumentException("jarURL is null"); } - return nativeLibJars.contains(jarURL); + return testLoadState(nativeLibJars.get(jarURL), exp); } - public static boolean containsClasses(URL jarURL) throws IOException { + public synchronized static boolean checkClasses(URL jarURL, LoadState exp) throws IOException { checkInitialized(); if(null == jarURL) { throw new IllegalArgumentException("jarURL is null"); } - return classFileJars.contains(jarURL); + return testLoadState(classFileJars.get(jarURL), exp); } - public static boolean containsResources(URL jarURL) throws IOException { + public synchronized static boolean checkResources(URL jarURL, LoadState exp) throws IOException { checkInitialized(); if(null == jarURL) { throw new IllegalArgumentException("jarURL is null"); } - return resourceFileJars.contains(jarURL); + return testLoadState(resourceFileJars.get(jarURL), exp); } /** @@ -192,20 +204,23 @@ public class TempJarCache { * * @param certClass if class is certified, the JarFile entries needs to have the same certificate * @param jarURL - * - * @throws IOException + * @throws IOException if the <code>jarURL</code> could not be loaded or a previous load attempt failed * @throws SecurityException */ - public static final void addNativeLibs(Class<?> certClass, URL jarURL, ClassLoader cl) throws IOException, SecurityException { - if(!containsNativeLibs(jarURL)) { - final JarFile jarFile = JarUtil.getJarFile(jarURL, cl); + public synchronized static final void addNativeLibs(Class<?> certClass, URL jarURL) throws IOException, SecurityException { + final LoadState nativeLibJarsLS = nativeLibJars.get(jarURL); + if( !testLoadState(nativeLibJarsLS, LoadState.LOOKED_UP) ) { + nativeLibJars.put(jarURL, LoadState.LOOKED_UP); + final JarFile jarFile = JarUtil.getJarFile(jarURL); if(DEBUG) { System.err.println("TempJarCache: addNativeLibs: "+jarURL+": nativeJar "+jarFile.getName()); } validateCertificates(certClass, jarFile); JarUtil.extract(tmpFileCache.getTempDir(), nativeLibMap, jarFile, true, false, false); - nativeLibJars.add(jarURL); + nativeLibJars.put(jarURL, LoadState.LOADED); + } else if( !testLoadState(nativeLibJarsLS, LoadState.LOADED) ) { + throw new IOException("TempJarCache: addNativeLibs: "+jarURL+", previous load attempt failed"); } } @@ -217,20 +232,23 @@ public class TempJarCache { * * @param certClass if class is certified, the JarFile entries needs to have the same certificate * @param jarFile - * - * @throws IOException + * @throws IOException if the <code>jarURL</code> could not be loaded or a previous load attempt failed * @throws SecurityException */ - public static final void addClasses(Class<?> certClass, URL jarURL, ClassLoader cl) throws IOException, SecurityException { - if(!containsClasses(jarURL)) { - final JarFile jarFile = JarUtil.getJarFile(jarURL, cl); + public synchronized static final void addClasses(Class<?> certClass, URL jarURL) throws IOException, SecurityException { + final LoadState classFileJarsLS = classFileJars.get(jarURL); + if( !testLoadState(classFileJarsLS, LoadState.LOOKED_UP) ) { + classFileJars.put(jarURL, LoadState.LOOKED_UP); + final JarFile jarFile = JarUtil.getJarFile(jarURL); if(DEBUG) { System.err.println("TempJarCache: addClasses: "+jarURL+": nativeJar "+jarFile.getName()); } validateCertificates(certClass, jarFile); JarUtil.extract(tmpFileCache.getTempDir(), null, jarFile, false, true, false); - classFileJars.add(jarURL); + classFileJars.put(jarURL, LoadState.LOADED); + } else if( !testLoadState(classFileJarsLS, LoadState.LOADED) ) { + throw new IOException("TempJarCache: addClasses: "+jarURL+", previous load attempt failed"); } } @@ -239,21 +257,24 @@ public class TempJarCache { * * @param certClass if class is certified, the JarFile entries needs to have the same certificate * @param jarFile - * * @return - * @throws IOException + * @throws IOException if the <code>jarURL</code> could not be loaded or a previous load attempt failed * @throws SecurityException */ - public static final void addResources(Class<?> certClass, URL jarURL, ClassLoader cl) throws IOException, SecurityException { - if(!containsResources(jarURL)) { - final JarFile jarFile = JarUtil.getJarFile(jarURL, cl); + public synchronized static final void addResources(Class<?> certClass, URL jarURL) throws IOException, SecurityException { + final LoadState resourceFileJarsLS = resourceFileJars.get(jarURL); + if( !testLoadState(resourceFileJarsLS, LoadState.LOOKED_UP) ) { + resourceFileJars.put(jarURL, LoadState.LOOKED_UP); + final JarFile jarFile = JarUtil.getJarFile(jarURL); if(DEBUG) { System.err.println("TempJarCache: addResources: "+jarURL+": nativeJar "+jarFile.getName()); } validateCertificates(certClass, jarFile); JarUtil.extract(tmpFileCache.getTempDir(), null, jarFile, false, false, true); - resourceFileJars.add(jarURL); + resourceFileJars.put(jarURL, LoadState.LOADED); + } else if( !testLoadState(resourceFileJarsLS, LoadState.LOADED) ) { + throw new IOException("TempJarCache: addResources: "+jarURL+", previous load attempt failed"); } } @@ -266,41 +287,62 @@ public class TempJarCache { * * @param certClass if class is certified, the JarFile entries needs to have the same certificate * @param jarFile - * - * @throws IOException + * @throws IOException if the <code>jarURL</code> could not be loaded or a previous load attempt failed * @throws SecurityException */ - public static final void addAll(Class<?> certClass, URL jarURL, ClassLoader cl) throws IOException, SecurityException { + public synchronized static final void addAll(Class<?> certClass, URL jarURL) throws IOException, SecurityException { checkInitialized(); if(null == jarURL) { throw new IllegalArgumentException("jarURL is null"); } - if(!nativeLibJars.contains(jarURL) || - !classFileJars.contains(jarURL) || - !resourceFileJars.contains(jarURL)) { - final JarFile jarFile = JarUtil.getJarFile(jarURL, cl); + final LoadState nativeLibJarsLS = nativeLibJars.get(jarURL); + final LoadState classFileJarsLS = classFileJars.get(jarURL); + final LoadState resourceFileJarsLS = resourceFileJars.get(jarURL); + if( !testLoadState(nativeLibJarsLS, LoadState.LOOKED_UP) || + !testLoadState(classFileJarsLS, LoadState.LOOKED_UP) || + !testLoadState(resourceFileJarsLS, LoadState.LOOKED_UP) ) { + + final boolean extractNativeLibraries = !testLoadState(nativeLibJarsLS, LoadState.LOADED); + final boolean extractClassFiles = !testLoadState(classFileJarsLS, LoadState.LOADED); + final boolean extractOtherFiles = !testLoadState(resourceFileJarsLS, LoadState.LOOKED_UP); + + // mark looked-up (those who are not loaded) + if(extractNativeLibraries) { + nativeLibJars.put(jarURL, LoadState.LOOKED_UP); + } + if(extractClassFiles) { + classFileJars.put(jarURL, LoadState.LOOKED_UP); + } + if(extractOtherFiles) { + resourceFileJars.put(jarURL, LoadState.LOOKED_UP); + } + + final JarFile jarFile = JarUtil.getJarFile(jarURL); if(DEBUG) { System.err.println("TempJarCache: addAll: "+jarURL+": nativeJar "+jarFile.getName()); } - final boolean extractNativeLibraries = !nativeLibJars.contains(jarURL); - final boolean extractClassFiles = !classFileJars.contains(jarURL); - final boolean extractOtherFiles = !resourceFileJars.contains(jarURL); validateCertificates(certClass, jarFile); JarUtil.extract(tmpFileCache.getTempDir(), nativeLibMap, jarFile, extractNativeLibraries, extractClassFiles, extractOtherFiles); + + // mark loaded (those were just loaded) if(extractNativeLibraries) { - nativeLibJars.add(jarURL); + nativeLibJars.put(jarURL, LoadState.LOADED); } if(extractClassFiles) { - classFileJars.add(jarURL); + classFileJars.put(jarURL, LoadState.LOADED); } if(extractOtherFiles) { - resourceFileJars.add(jarURL); + resourceFileJars.put(jarURL, LoadState.LOADED); } + } else if( !testLoadState(nativeLibJarsLS, LoadState.LOADED) || + !testLoadState(classFileJarsLS, LoadState.LOADED) || + !testLoadState(resourceFileJarsLS, LoadState.LOADED) ) { + throw new IOException("TempJarCache: addAll: "+jarURL+", previous load attempt failed"); } } - public static final String findLibrary(String libName) { + public synchronized static final String findLibrary(String libName) { checkInitialized(); // try with mapped library basename first String path = nativeLibMap.get(libName); @@ -331,7 +373,7 @@ public class TempJarCache { return null; } */ - public static final String findResource(String name) { + public synchronized static final String findResource(String name) { checkInitialized(); final File f = new File(tmpFileCache.getTempDir(), name); if(f.exists()) { @@ -340,7 +382,7 @@ public class TempJarCache { return null; } - public static final URL getResource(String name) throws MalformedURLException { + public synchronized static final URL getResource(String name) throws MalformedURLException { checkInitialized(); final File f = new File(tmpFileCache.getTempDir(), name); if(f.exists()) { @@ -360,13 +402,20 @@ public class TempJarCache { * @throws IOException * @throws SecurityException */ - public static final void bootstrapNativeLib(Class<?> certClass, String libBaseName, URL jarURL, ClassLoader cl) + public synchronized static final void bootstrapNativeLib(Class<?> certClass, String libBaseName, URL jarURL) throws IOException, SecurityException { checkInitialized(); - if(!nativeLibJars.contains(jarURL) && !nativeLibMap.containsKey(libBaseName) ) { - final JarFile jarFile = JarUtil.getJarFile(jarURL, cl); + boolean ok = false; + int countEntries = 0; + final LoadState nativeLibJarsLS = nativeLibJars.get(jarURL); + if( !testLoadState(nativeLibJarsLS, LoadState.LOOKED_UP) && !nativeLibMap.containsKey(libBaseName) ) { if(DEBUG) { - System.err.println("TempJarCache: bootstrapNativeLib: "+jarURL+": nativeJar "+jarFile.getName()+" - libBaseName: "+libBaseName); + System.err.println("TempJarCache: bootstrapNativeLib(certClass: "+certClass+", libBaseName "+libBaseName+", jarURL "+jarURL+")"); + } + nativeLibJars.put(jarURL, LoadState.LOOKED_UP); + final JarFile jarFile = JarUtil.getJarFile(jarURL); + if(DEBUG) { + System.err.println("TempJarCache: bootstrapNativeLib: nativeJar "+jarFile.getName()); } validateCertificates(certClass, jarFile); final Enumeration<JarEntry> entries = jarFile.entries(); @@ -385,18 +434,27 @@ public class TempJarCache { try { final byte[] buf = new byte[ 2048 ]; while (true) { - int count; - if ((count = in.read(buf)) == -1) { break; } - out.write(buf, 0, count); - numBytes += count; + int countBytes; + if ((countBytes = in.read(buf)) == -1) { break; } + out.write(buf, 0, countBytes); + numBytes += countBytes; } } finally { in.close(); out.close(); } if (numBytes>0) { nativeLibMap.put(libBaseName, destFile.getAbsolutePath()); - nativeLibJars.add(jarURL); + nativeLibJars.put(jarURL, LoadState.LOADED); + ok = true; + countEntries++; } } } + } else if( testLoadState(nativeLibJarsLS, LoadState.LOADED) ) { + ok = true; // already loaded + } else { + throw new IOException("TempJarCache: bootstrapNativeLib: "+jarURL+", previous load attempt failed"); + } + if(DEBUG) { + System.err.println("TempJarCache: bootstrapNativeLib() done, count "+countEntries+", ok "+ok); } } |