diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
index 77e9c9357e..65798ab3fa 100644
--- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactory.java
@@ -19,6 +19,7 @@ package org.springframework.boot.context.embedded;
 import java.io.File;
 import java.io.IOException;
 import java.net.JarURLConnection;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLConnection;
@@ -87,7 +88,7 @@ public abstract class AbstractEmbeddedServletContainerFactory
 	}
 
 	private File getExplodedWarFileDocumentRoot() {
-		return getExplodedWarFileDocumentRoot(getCodeSourceArchive());
+		return getExplodedWarFileDocumentRoot(getCodeSourceArchive(getCodeSource()));
 	}
 
 	protected List<URL> getUrlsOfJarsWithMetaInfResources() {
@@ -172,7 +173,7 @@ public abstract class AbstractEmbeddedServletContainerFactory
 	}
 
 	private File getArchiveFileDocumentRoot(String extension) {
-		File file = getCodeSourceArchive();
+		File file = getCodeSourceArchive(getCodeSource());
 		if (this.logger.isDebugEnabled()) {
 			this.logger.debug("Code archive: " + file);
 		}
@@ -193,19 +194,21 @@ public abstract class AbstractEmbeddedServletContainerFactory
 		return null;
 	}
 
-	private File getCodeSourceArchive() {
+	File getCodeSourceArchive(CodeSource codeSource) {
 		try {
-			CodeSource codeSource = getClass().getProtectionDomain().getCodeSource();
 			URL location = (codeSource == null ? null : codeSource.getLocation());
 			if (location == null) {
 				return null;
 			}
-			String path = location.getPath();
+			String path;
 			URLConnection connection = location.openConnection();
 			if (connection instanceof JarURLConnection) {
 				path = ((JarURLConnection) connection).getJarFile().getName();
 			}
-			if (path.indexOf("!/") != -1) {
+			else {
+				path = location.toURI().getPath();
+			}
+			if (path.contains("!/")) {
 				path = path.substring(0, path.indexOf("!/"));
 			}
 			return new File(path);
@@ -213,6 +216,13 @@ public abstract class AbstractEmbeddedServletContainerFactory
 		catch (IOException ex) {
 			return null;
 		}
+		catch (URISyntaxException e) {
+			return null;
+		}
+	}
+
+	private CodeSource getCodeSource() {
+		return getClass().getProtectionDomain().getCodeSource();
 	}
 
 	protected final File getValidSessionStoreDir() {
diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
index 7305b07a47..2042d12f74 100644
--- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
+++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
@@ -30,9 +30,11 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.Charset;
+import java.security.CodeSource;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
+import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.Arrays;
@@ -673,6 +675,22 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
 		assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
 	}
 
+	@Test
+	public void codeSourceArchivePath() throws Exception {
+		AbstractEmbeddedServletContainerFactory factory = getFactory();
+		final CodeSource codeSource = new CodeSource(new URL("file", "", "/some/test/path/"), (Certificate[]) null);
+		final File codeSourceArchive = factory.getCodeSourceArchive(codeSource);
+		assertThat(codeSourceArchive).isEqualTo(new File("/some/test/path/"));
+	}
+
+	@Test
+	public void codeSourceArchivePathContainingSpaces() throws Exception {
+		AbstractEmbeddedServletContainerFactory factory = getFactory();
+		final CodeSource codeSource = new CodeSource(new URL("file", "", "/test/path/with%20space/"), (Certificate[]) null);
+		final File codeSourceArchive = factory.getCodeSourceArchive(codeSource);
+		assertThat(codeSourceArchive).isEqualTo(new File("/test/path/with space/"));
+	}
+
 	protected Ssl getSsl(ClientAuth clientAuth, String keyPassword, String keyStore) {
 		return getSsl(clientAuth, keyPassword, keyStore, null, null, null);
 	}