mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
fixed ExplodedArchive which fail on windows
* when run 'java org.springframework.boot.loader.JarLauncher' Fixes gh-176
This commit is contained in:
parent
3f25fec65f
commit
2a10503167
@ -39,7 +39,7 @@ import org.springframework.boot.loader.AsciiBytes;
|
||||
|
||||
/**
|
||||
* {@link Archive} implementation backed by an exploded archive directory.
|
||||
*
|
||||
*
|
||||
* @author Phillip Webb
|
||||
*/
|
||||
public class ExplodedArchive extends Archive {
|
||||
@ -72,11 +72,7 @@ public class ExplodedArchive extends Archive {
|
||||
|
||||
private void buildEntries(File file) {
|
||||
if (!file.equals(this.root)) {
|
||||
String name = file.getAbsolutePath().substring(
|
||||
this.root.getAbsolutePath().length() + 1);
|
||||
if (file.isDirectory()) {
|
||||
name += "/";
|
||||
}
|
||||
String name = file.toURI().getPath().substring(root.toURI().getPath().length());
|
||||
FileEntry entry = new FileEntry(new AsciiBytes(name), file);
|
||||
this.entries.put(entry.getName(), entry);
|
||||
}
|
||||
@ -92,7 +88,7 @@ public class ExplodedArchive extends Archive {
|
||||
@Override
|
||||
public URL getUrl() throws MalformedURLException {
|
||||
FilteredURLStreamHandler handler = new FilteredURLStreamHandler();
|
||||
return new URL("file", "", -1, this.root.getAbsolutePath() + "/", handler);
|
||||
return new URL("file", "", -1, this.root.toURI().getPath(), handler);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -181,7 +177,7 @@ public class ExplodedArchive extends Archive {
|
||||
@Override
|
||||
protected URLConnection openConnection(URL url) throws IOException {
|
||||
String name = url.getPath().substring(
|
||||
ExplodedArchive.this.root.getAbsolutePath().length() + 1);
|
||||
ExplodedArchive.this.root.toURI().getPath().length());
|
||||
if (ExplodedArchive.this.entries.containsKey(new AsciiBytes(name))) {
|
||||
return new URL(url.toString()).openConnection();
|
||||
}
|
||||
|
@ -122,7 +122,7 @@ public class ExplodedArchiveTests {
|
||||
Map<String, Entry> nestedEntries = getEntriesMap(nested);
|
||||
assertThat(nestedEntries.size(), equalTo(1));
|
||||
assertThat(nested.getUrl().toString(),
|
||||
equalTo("file:" + this.rootFolder.getPath() + File.separator + "d/"));
|
||||
equalTo("file:" + this.rootFolder.toURI().getPath() + "d/"));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Loading…
Reference in New Issue
Block a user