resource caching fix

hansonr · hansonr · commit 416fa7717c54 · 2019-04-25T06:25:03.000-05:00
diff --git a/sources/net.sf.j2s.java.core/src/java/util/ResourceBundle.java b/sources/net.sf.j2s.java.core/src/java/util/ResourceBundle.java
@@ -2424,15 +2424,10 @@ public ResourceBundle newBundle(String baseName, Locale locale, String format, O
 				// }
 			} else if (format.equals("java.properties")) {
 				final String resourceName = toResourceName0(bundleName, "properties");
-				if (resourceName == null) {
+				InputStream stream;
+				if (resourceName == null || (stream = JSUtil.getCachedResourceAsStream(resourceName)) == null)
 					return null;
-				}
-				// final ClassLoader ClassLoader = loader;
-				// final boolean reloadFlag = reload;
-				String data = JSUtil.getJavaResource(resourceName, false, true, false);
 
-				InputStream stream = (data == null ? null
-						: new BufferedInputStream(new ByteArrayInputStream(data.getBytes())));
 				// // try {
 				// stream = AccessController.doPrivileged(
 				// new PrivilegedAction<InputStream>() {
