stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Sean Mullan 2013-03-20 12:06:30 -04:00
commit 02374952e1
3 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/sun/net/www/protocol/jar/JarURLConnection.java
View File

@ -51,7 +51,7 @@ public class JarURLConnection extends java.net.JarURLConnection {
/* the Jar file factory. It handles both retrieval and caching.
*/
private static JarFileFactory factory = new JarFileFactory();
private static final JarFileFactory factory = JarFileFactory.getInstance();
/* the url for the Jar file */
private URL jarFileURL;

32
jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
View File

@ -43,13 +43,24 @@ import sun.net.util.URLUtil;
class JarFileFactory implements URLJarFile.URLJarFileCloseController {
/* the url to file cache */
private static HashMap<String, JarFile> fileCache = new HashMap<String, JarFile>();
private static final HashMap<String, JarFile> fileCache = new HashMap<>();
/* the file to url cache */
private static HashMap<JarFile, URL> urlCache = new HashMap<JarFile, URL>();
private static final HashMap<JarFile, URL> urlCache = new HashMap<>();
private static final JarFileFactory instance = new JarFileFactory();
private JarFileFactory() { }
public static JarFileFactory getInstance() {
return instance;
}
URLConnection getConnection(JarFile jarFile) throws IOException {
URL u = urlCache.get(jarFile);
URL u;
synchronized (instance) {
u = urlCache.get(jarFile);
}
if (u != null)
return u.openConnection();
@ -62,16 +73,16 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController {
JarFile get(URL url, boolean useCaches) throws IOException {
JarFile result = null;
JarFile local_result = null;
JarFile result;
JarFile local_result;
if (useCaches) {
synchronized (this) {
synchronized (instance) {
result = getCachedJarFile(url);
}
if (result == null) {
local_result = URLJarFile.getJarFile(url, this);
synchronized (this) {
synchronized (instance) {
result = getCachedJarFile(url);
if (result == null) {
fileCache.put(URLUtil.urlNoFragString(url), local_result);
@ -99,14 +110,15 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController {
* remove the JarFile from the cache
*/
public void close(JarFile jarFile) {
URL urlRemoved = urlCache.remove(jarFile);
if( urlRemoved != null) {
synchronized (instance) {
URL urlRemoved = urlCache.remove(jarFile);
if (urlRemoved != null)
fileCache.remove(URLUtil.urlNoFragString(urlRemoved));
}
}
private JarFile getCachedJarFile(URL url) {
assert Thread.holdsLock(instance);
JarFile result = fileCache.get(URLUtil.urlNoFragString(url));
/* if the JAR file is cached, the permission will always be there */

31
jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
View File

@ -43,13 +43,24 @@ import sun.net.util.URLUtil;
class JarFileFactory implements URLJarFile.URLJarFileCloseController {
/* the url to file cache */
private static HashMap<String, JarFile> fileCache = new HashMap<String, JarFile>();
private static final HashMap<String, JarFile> fileCache = new HashMap<>();
/* the file to url cache */
private static HashMap<JarFile, URL> urlCache = new HashMap<JarFile, URL>();
private static final HashMap<JarFile, URL> urlCache = new HashMap<>();
private static final JarFileFactory instance = new JarFileFactory();
private JarFileFactory() { }
public static JarFileFactory getInstance() {
return instance;
}
URLConnection getConnection(JarFile jarFile) throws IOException {
URL u = urlCache.get(jarFile);
URL u;
synchronized (instance) {
u = urlCache.get(jarFile);
}
if (u != null)
return u.openConnection();
@ -72,16 +83,16 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController {
}
}
JarFile result = null;
JarFile local_result = null;
JarFile result;
JarFile local_result;
if (useCaches) {
synchronized (this) {
synchronized (instance) {
result = getCachedJarFile(url);
}
if (result == null) {
local_result = URLJarFile.getJarFile(url, this);
synchronized (this) {
synchronized (instance) {
result = getCachedJarFile(url);
if (result == null) {
fileCache.put(URLUtil.urlNoFragString(url), local_result);
@ -109,13 +120,15 @@ class JarFileFactory implements URLJarFile.URLJarFileCloseController {
* remove the JarFile from the cache
*/
public void close(JarFile jarFile) {
URL urlRemoved = urlCache.remove(jarFile);
if( urlRemoved != null) {
synchronized (instance) {
URL urlRemoved = urlCache.remove(jarFile);
if (urlRemoved != null)
fileCache.remove(URLUtil.urlNoFragString(urlRemoved));
}
}
private JarFile getCachedJarFile(URL url) {
assert Thread.holdsLock(instance);
JarFile result = fileCache.get(URLUtil.urlNoFragString(url));
/* if the JAR file is cached, the permission will always be there */