Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.4.x'

Browse Source 
Closes gh-26451
This commit is contained in:
Andy Wilkinson
2021-05-13 11:44:27 +01:00
parent e9adb1ab88 970f933806
commit f92510e39d
2 changed files with 8 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/HandlerTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2020 the original author or authors.
* Copyright 2012-2021 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -172,13 +172,9 @@ class HandlerTests {
TestJarCreator.createTestJar(testJar);
URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
JarURLConnection connection = (JarURLConnection) url.openConnection();
JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile());
try {
try (JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile())) {
assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
}
finally {
jarFile.close();
}
}
@Test
@@ -187,13 +183,9 @@ class HandlerTests {
TestJarCreator.createTestJar(testJar);
URL url = new URL(null, "jar:" + testJar.toURI().toURL() + "!/nested.jar!/3.dat", this.handler);
JarURLConnection connection = (JarURLConnection) url.openConnection();
JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile());
try {
try (JarFile jarFile = JarFileWrapper.unwrap(connection.getJarFile())) {
assertThat(jarFile.getRootJarFile().getFile()).isEqualTo(testJar);
}
finally {
jarFile.close();
}
}
private void assertStandardAndCustomHandlerUrlsAreEqual(String context, String spec) throws MalformedURLException {