From 825fc2f7df11da4ad7a0dc82884c43fdbfc8f352 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Wed, 19 Feb 2014 13:59:05 +0000 Subject: [PATCH] Omit jar: prefix from jarFileUrl --- .../springframework/boot/loader/jar/JarURLConnection.java | 4 ++-- .../org/springframework/boot/loader/jar/JarFileTests.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java index f7b29edb3d4..6ba908d7baa 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarURLConnection.java @@ -63,12 +63,12 @@ class JarURLConnection extends java.net.JarURLConnection { * sensible for #getJarFileURL(). */ if (separator + SEPARATOR.length() != spec.length()) { - this.jarFileUrl = new URL("jar:" + spec); + this.jarFileUrl = new URL(spec); this.jarEntryName = spec.substring(separator + 2); } else { // The root of the archive (!/) - this.jarFileUrl = new URL("jar:" + spec.substring(0, separator)); + this.jarFileUrl = new URL(spec.substring(0, separator)); } } diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java index 244dcc3004f..701addaecb6 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java @@ -150,7 +150,7 @@ public class JarFileTests { assertThat(jarURLConnection.getContentLength(), greaterThan(1)); assertThat(jarURLConnection.getContent(), sameInstance((Object) this.jarFile)); assertThat(jarURLConnection.getContentType(), equalTo("x-java/jar")); - assertThat(jarURLConnection.getJarFileURL().toString(), equalTo("jar:file:" + assertThat(jarURLConnection.getJarFileURL().toString(), equalTo("file:" + this.rootJarFile)); } @@ -216,8 +216,8 @@ public class JarFileTests { + "!/nested.jar!/")); JarURLConnection conn = (JarURLConnection) url.openConnection(); assertThat(conn.getJarFile(), sameInstance(nestedJarFile)); - assertThat(conn.getJarFileURL().toString(), equalTo("jar:file:" - + this.rootJarFile.getPath() + "!/nested.jar")); + assertThat(conn.getJarFileURL().toString(), + equalTo("file:" + this.rootJarFile.getPath() + "!/nested.jar")); } @Test