Refine PropertiesLauncher close logic

Further attempt to fix Windows file issues. See gh-21575
spring-projects · Jun 11, 2020 · 2a37b2e · 2a37b2e
1 parent 1e7da4d
commit 2a37b2e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/.../spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java b/.../spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
@@ -29,11 +29,9 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.jar.Manifest;
@@ -531,7 +529,7 @@ private class ClassPathArchives implements Iterable<Archive> {
 
 		private final List<Archive> classPathArchives;
 
-		private final Map<File, JarFileArchive> jarFileArchives = new LinkedHashMap<>();
+		private final List<JarFileArchive> jarFileArchives = new ArrayList<>();
 
 		ClassPathArchives() throws Exception {
 			this.classPathArchives = new ArrayList<>();
@@ -666,11 +664,8 @@ private List<Archive> asList(Iterator<Archive> iterator) {
 		}
 
 		private JarFileArchive getJarFileArchive(File file) throws IOException {
-			JarFileArchive archive = this.jarFileArchives.get(file);
-			if (archive == null) {
-				archive = new JarFileArchive(file);
-				this.jarFileArchives.put(file, archive);
-			}
+			JarFileArchive archive = new JarFileArchive(file);
+			this.jarFileArchives.add(archive);
 			return archive;
 		}
 
@@ -680,7 +675,7 @@ public Iterator<Archive> iterator() {
 		}
 
 		void close() throws IOException {
-			for (JarFileArchive archive : this.jarFileArchives.values()) {
+			for (JarFileArchive archive : this.jarFileArchives) {
 				archive.close();
 			}
 		}

diff --git a/...ng-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java b/...ng-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java
@@ -389,6 +389,10 @@ void loadResourceFromJarFile() throws Exception {
 			this.launcher.launch(new String[0]);
 		}
 		catch (Exception ex) {
+			// Expected ClassNotFoundException
+			LaunchedURLClassLoader classLoader = (LaunchedURLClassLoader) Thread.currentThread()
+					.getContextClassLoader();
+			classLoader.close();
 		}
 		URL resource = new URL("jar:" + jarFile.toURI() + "!/nested.jar!/3.dat");
 		byte[] bytes = FileCopyUtils.copyToByteArray(resource.openStream());