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

Merge branch '2.1.x' 

Closes gh-18502
This commit is contained in:
Andy Wilkinson 2019-10-03 15:34:32 +01:00
parent bc8a88d734 f42b442ce2
commit 078536aded
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java
View File

@ -22,6 +22,7 @@ import java.lang.management.ManagementFactory;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.net.URLDecoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -156,7 +157,13 @@ final class ChangeableUrls implements Iterable<URL> {
urls.add(referenced); urls.add(referenced);
} }
else { else {
nonExistentEntries.add(referenced); referenced = new URL(jarUrl, URLDecoder.decode(entry, "UTF-8"));
if (new File(referenced.getFile()).exists()) {
urls.add(referenced);
}
else {
nonExistentEntries.add(referenced);
}
} }
} }
catch (MalformedURLException ex) { catch (MalformedURLException ex) {

7
spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java
View File

@ -87,14 +87,17 @@ class ChangeableUrlsTests {
absolute.mkdirs(); absolute.mkdirs();
URL absoluteUrl = absolute.toURI().toURL(); URL absoluteUrl = absolute.toURI().toURL();
File jarWithClassPath = makeJarFileWithUrlsInManifestClassPath("project-core/target/classes/", File jarWithClassPath = makeJarFileWithUrlsInManifestClassPath("project-core/target/classes/",
"project-web/target/classes/", "does-not-exist/target/classes", relative.getName() + "/", absoluteUrl); "project-web/target/classes/", "project%20space/target/classes/", "does-not-exist/target/classes/",
relative.getName() + "/", absoluteUrl);
new File(jarWithClassPath.getParentFile(), "project-core/target/classes").mkdirs(); new File(jarWithClassPath.getParentFile(), "project-core/target/classes").mkdirs();
new File(jarWithClassPath.getParentFile(), "project-web/target/classes").mkdirs(); new File(jarWithClassPath.getParentFile(), "project-web/target/classes").mkdirs();
new File(jarWithClassPath.getParentFile(), "project space/target/classes").mkdirs();
ChangeableUrls urls = ChangeableUrls.fromClassLoader( ChangeableUrls urls = ChangeableUrls.fromClassLoader(
new URLClassLoader(new URL[] { jarWithClassPath.toURI().toURL(), makeJarFileWithNoManifest() })); new URLClassLoader(new URL[] { jarWithClassPath.toURI().toURL(), makeJarFileWithNoManifest() }));
assertThat(urls.toList()).containsExactly( assertThat(urls.toList()).containsExactly(
new URL(jarWithClassPath.toURI().toURL(), "project-core/target/classes/"), new URL(jarWithClassPath.toURI().toURL(), "project-core/target/classes/"),
new URL(jarWithClassPath.toURI().toURL(), "project-web/target/classes/"), relative.toURI().toURL(), new URL(jarWithClassPath.toURI().toURL(), "project-web/target/classes/"),
new URL(jarWithClassPath.toURI().toURL(), "project space/target/classes/"), relative.toURI().toURL(),
absoluteUrl); absoluteUrl);
} }