Assets fix for missing resource

hansonr · hansonr · commit 781ee58cb051 · 2020-08-07T06:45:45.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/javajs/async/Assets.java b/sources/net.sf.j2s.java.core/src/javajs/async/Assets.java
@@ -96,6 +96,12 @@ public class Assets {
 		}
 	}
 
+	/**
+	 * track not-found resources
+	 * 
+	 */
+	private static HashSet<String> nullResources;
+
 	private Map<String, Map<String, ZipEntry>> htZipContents = new HashMap<>();
 
 	private static boolean doCacheZipContents = true;
@@ -229,8 +235,13 @@ public static void add(String name, String zipFile, String path) {
 	public static boolean hasLoaded(String name) {
 		return loadedAssets.contains(name);
 	}
-	
+
+	/**
+	 * Completely reset the assets data.
+	 * 
+	 */
 	public static void reset() {
+		nullResources = null;
 		getInstance().htZipContents.clear();
 		getInstance().assetsByPath.clear();
 		getInstance().sortedList = new String[0];
@@ -429,14 +440,17 @@ private URL _getURLFromPath(String fullPath, boolean zipOnly) {
 	}
 
 	public static ZipEntry findZipEntry(URL url) {
+		if (url == null)
+			return null;
 		String[] parts = getJarURLParts(url.toString());
 		if (parts == null || parts[0] == null || parts[1].length() == 0)
 			return null;
 		return findZipEntry(parts[0], parts[1]);
 	}
 
 	public static ZipEntry findZipEntry(String zipFile, String fileName) {
-		return getZipContents(zipFile).get(fileName);
+		Map<String, ZipEntry> map = getZipContents(zipFile);
+		return (map == null ? null : map.get(fileName));
 	}
 
 	/**
@@ -449,7 +463,20 @@ public static Map<String, ZipEntry> getZipContents(String zipPath) {
 		return getInstance()._getZipContents(zipPath);
 	}
 
+	public static boolean notFound(String zipPath) {
+		return (nullResources != null && nullResources.contains(zipPath));
+	}
+	
+	public static void setNotFound(String zipPath) {
+		if (nullResources == null) {
+			nullResources = new HashSet<>();
+		}		
+		nullResources.add(zipPath);
+	}
+
 	private Map<String, ZipEntry> _getZipContents(String zipPath) {
+		if (notFound(zipPath))
+			return null;
 		URL url = getURLWithCachedBytes(zipPath); // BH carry over bytes if we have them already
 		Map<String, ZipEntry> fileNames = htZipContents.get(url.toString());
 		if (fileNames != null)
@@ -458,7 +485,8 @@ private Map<String, ZipEntry> _getZipContents(String zipPath) {
 			// Scan URL zip stream for files.
 			return readZipContents(url.openStream(), url);
 		} catch (Exception ex) {
-			ex.printStackTrace();
+			System.err.println("Assets: " + zipPath + " could not be opened");
+			setNotFound(zipPath);
 			return null;
 		}
 	}
