Merge branch '1.3.x'

vivswam · Jun 15, 2016 · af20dc6 · af20dc6
2 parents fc78a8d + 159ef8f
commit af20dc6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/...ng-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java b/...ng-boot-loader/src/main/java/org/springframework/boot/loader/archive/ExplodedArchive.java
@@ -84,7 +84,7 @@ private File getManifestFile(File root) {
 
 	@Override
 	public URL getUrl() throws MalformedURLException {
-		return new URL("file", "", -1, this.root.toURI().getPath());
+		return this.root.toURI().toURL();
 	}
 
 	@Override

diff --git a/...ot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java b/...ot-loader/src/test/java/org/springframework/boot/loader/archive/ExplodedArchiveTests.java
@@ -23,7 +23,6 @@
 import java.io.OutputStream;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.net.URLDecoder;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
@@ -37,6 +36,7 @@
 
 import org.springframework.boot.loader.TestJarCreator;
 import org.springframework.boot.loader.archive.Archive.Entry;
+import org.springframework.util.StringUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -45,6 +45,7 @@
  *
  * @author Phillip Webb
  * @author Dave Syer
+ * @author Andy Wilkinson
  */
 public class ExplodedArchiveTests {
 
@@ -57,10 +58,20 @@ public class ExplodedArchiveTests {
 
 	@Before
 	public void setup() throws Exception {
+		createArchive();
+	}
+
+	private void createArchive() throws Exception {
+		createArchive(null);
+	}
+
+	private void createArchive(String folderName) throws Exception {
 		File file = this.temporaryFolder.newFile();
 		TestJarCreator.createTestJar(file);
 
-		this.rootFolder = this.temporaryFolder.newFolder();
+		this.rootFolder = StringUtils.hasText(folderName)
+				? this.temporaryFolder.newFolder(folderName)
+				: this.temporaryFolder.newFolder();
 		JarFile jarFile = new JarFile(file);
 		Enumeration<JarEntry> entries = jarFile.entries();
 		while (entries.hasMoreElements()) {
@@ -102,9 +113,13 @@ public void getEntries() throws Exception {
 
 	@Test
 	public void getUrl() throws Exception {
-		URL url = this.archive.getUrl();
-		assertThat(new File(URLDecoder.decode(url.getFile(), "UTF-8")))
-				.isEqualTo(this.rootFolder);
+		assertThat(this.archive.getUrl()).isEqualTo(this.rootFolder.toURI().toURL());
+	}
+
+	@Test
+	public void getUrlWithSpaceInPath() throws Exception {
+		createArchive("spaces in the name");
+		assertThat(this.archive.getUrl()).isEqualTo(this.rootFolder.toURI().toURL());
 	}
 
 	@Test