Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson 2016-06-24 11:53:01 +01:00
commit 9788a7bdda
1 changed files with 5 additions and 3 deletions

View File

@ -82,7 +82,7 @@ class JarURLConnection extends java.net.JarURLConnection {
private final JarFile jarFile;
private final Permission permission;
private Permission permission;
private URL jarFileUrl;
@ -103,8 +103,6 @@ class JarURLConnection extends java.net.JarURLConnection {
}
this.jarFile = jarFile;
this.jarEntryName = getJarEntryName(spec);
this.permission = new FilePermission(jarFile.getRootJarFile().getFile().getPath(),
READ_ACTION);
}
private String getNormalizedFileUrl(URL url) {
@ -243,6 +241,10 @@ class JarURLConnection extends java.net.JarURLConnection {
@Override
public Permission getPermission() throws IOException {
if (this.permission == null) {
this.permission = new FilePermission(
this.jarFile.getRootJarFile().getFile().getPath(), READ_ACTION);
}
return this.permission;
}