Commit 7103eab2 authored by Andy Wilkinson's avatar Andy Wilkinson

Close JarFiles when looking for Class-Path manifest entries

Fixes gh-17095
parent 9c7f2478
......@@ -117,29 +117,24 @@ final class ChangeableUrls implements Iterable<URL> {
}
private static List<URL> getUrlsFromClassPathOfJarManifestIfPossible(URL url) {
JarFile jarFile = getJarFileIfPossible(url);
if (jarFile == null) {
return Collections.emptyList();
}
try {
return getUrlsFromManifestClassPathAttribute(url, jarFile);
}
catch (IOException ex) {
throw new IllegalStateException("Failed to read Class-Path attribute from manifest of jar " + url, ex);
}
}
private static JarFile getJarFileIfPossible(URL url) {
try {
File file = new File(url.toURI());
if (file.isFile()) {
return new JarFile(file);
try (JarFile jarFile = new JarFile(file)) {
try {
return getUrlsFromManifestClassPathAttribute(url, jarFile);
}
catch (IOException ex) {
throw new IllegalStateException(
"Failed to read Class-Path attribute from manifest of jar " + url, ex);
}
}
}
}
catch (Exception ex) {
// Assume it's not a jar and continue
}
return null;
return Collections.emptyList();
}
private static List<URL> getUrlsFromManifestClassPathAttribute(URL jarUrl, JarFile jarFile) throws IOException {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment