Browse Source

Merge pull request #20872 from Konrado85

* pr/20872:
  Change PropertiesLauncher equals method to use URI

Closes gh-20872
pull/20936/head
Stephane Nicoll 6 years ago
parent
commit
2ee73a6c83
  1. 2
      spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java

2
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java

@ -516,7 +516,7 @@ public class PropertiesLauncher extends Launcher { @@ -516,7 +516,7 @@ public class PropertiesLauncher extends Launcher {
private List<Archive> getNestedArchives(String path) throws Exception {
Archive parent = this.parent;
String root = path;
if (!root.equals("/") && root.startsWith("/") || parent.getUrl().equals(this.home.toURI().toURL())) {
if (!root.equals("/") && root.startsWith("/") || parent.getUrl().toURI().equals(this.home.toURI())) {
// If home dir is same as parent archive, no need to add it twice.
return null;
}

Loading…
Cancel
Save