root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.3.x'

This commit is contained in:
Phillip Webb 2020-06-11 13:26:44 -07:00
parent 3892f4402a 2a37b2e258
commit 82abcd3043
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
View File

@ -29,11 +29,9 @@ import java.net.URLDecoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.jar.Manifest; import java.util.jar.Manifest;
@ -531,7 +529,7 @@ public class PropertiesLauncher extends Launcher {
private final List<Archive> classPathArchives; private final List<Archive> classPathArchives;
private final Map<File, JarFileArchive> jarFileArchives = new LinkedHashMap<>(); private final List<JarFileArchive> jarFileArchives = new ArrayList<>();
ClassPathArchives() throws Exception { ClassPathArchives() throws Exception {
this.classPathArchives = new ArrayList<>(); this.classPathArchives = new ArrayList<>();
@ -666,11 +664,8 @@ public class PropertiesLauncher extends Launcher {
} }
private JarFileArchive getJarFileArchive(File file) throws IOException { private JarFileArchive getJarFileArchive(File file) throws IOException {
JarFileArchive archive = this.jarFileArchives.get(file); JarFileArchive archive = new JarFileArchive(file);
if (archive == null) { this.jarFileArchives.add(archive);
archive = new JarFileArchive(file);
this.jarFileArchives.put(file, archive);
}
return archive; return archive;
} }
@ -680,7 +675,7 @@ public class PropertiesLauncher extends Launcher {
} }
void close() throws IOException { void close() throws IOException {
for (JarFileArchive archive : this.jarFileArchives.values()) { for (JarFileArchive archive : this.jarFileArchives) {
archive.close(); archive.close();
} }
} }

4
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java
View File

@ -389,6 +389,10 @@ class PropertiesLauncherTests {
this.launcher.launch(new String[0]); this.launcher.launch(new String[0]);
} }
catch (Exception ex) { catch (Exception ex) {
// Expected ClassNotFoundException
LaunchedURLClassLoader classLoader = (LaunchedURLClassLoader) Thread.currentThread()
.getContextClassLoader();
classLoader.close();
} }
URL resource = new URL("jar:" + jarFile.toURI() + "!/nested.jar!/3.dat"); URL resource = new URL("jar:" + jarFile.toURI() + "!/nested.jar!/3.dat");
byte[] bytes = FileCopyUtils.copyToByteArray(resource.openStream()); byte[] bytes = FileCopyUtils.copyToByteArray(resource.openStream());