Skip to content

Change PropertiesLauncher equals method to use URI rather than URL #20872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Change PropertiesLauncher equals method to use URI rather than URL #20872

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dcbf57
Bug fix in getNestedArchives
Konrado85 Apr 7, 2020
b45bbab
Fix checkstyle
Konrado85 Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../spring-boot-loader/src/main/java/org/springframework/boot/loader/PropertiesLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ private boolean isNestedArchivePath(File file) {
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;
}
Expand Down