Merge branch '2.3.x'

2020-06-11 13:26:44 -07:00
parent 3892f4402a 2a37b2e258
commit 82abcd3043
2 changed files with 8 additions and 9 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/PropertiesLauncherTests.java
@@ -389,6 +389,10 @@ class PropertiesLauncherTests {
 			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());