Merge branch '1.3.x'

Author: wilkinsona

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java

@@ -118,6 +118,9 @@ private static JarFile getJarFileIfPossible(URL url) {
 	}
 
 	private static List<URL> getUrlsFromClassPathAttribute(URL base, Manifest manifest) {
+		if (manifest == null) {
+			return Collections.<URL>emptyList();
+		}
 		String classPath = manifest.getMainAttributes()
 				.getValue(Attributes.Name.CLASS_PATH);
 		if (!StringUtils.hasText(classPath)) {

spring-boot-devtools/src/test/java/org/springframework/boot/devtools/restart/ChangeableUrlsTests.java

@@ -24,6 +24,7 @@
 import java.util.jar.Attributes;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
+import java.util.zip.ZipOutputStream;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -76,9 +77,11 @@ public void urlsFromJarClassPathAreConsidered() throws Exception {
 		URL projectCore = makeUrl("project-core");
 		URL projectWeb = makeUrl("project-web");
 		File relative = this.temporaryFolder.newFolder();
-		ChangeableUrls urls = ChangeableUrls.fromUrlClassLoader(new URLClassLoader(
-				new URL[] { makeJarFileWithUrlsInManifestClassPath(projectCore,
-						projectWeb, relative.getName() + "/") }));
+		ChangeableUrls urls = ChangeableUrls
+				.fromUrlClassLoader(new URLClassLoader(new URL[] {
+						makeJarFileWithUrlsInManifestClassPath(projectCore, projectWeb,
+								relative.getName() + "/"),
+						makeJarFileWithNoManifest() }));
 		assertThat(urls.toList()).containsExactly(projectCore, projectWeb,
 				relative.toURI().toURL());
 	}
@@ -103,4 +106,10 @@ private URL makeJarFileWithUrlsInManifestClassPath(Object... urls) throws Except
 		return classpathJar.toURI().toURL();
 	}
 
+	private URL makeJarFileWithNoManifest() throws Exception {
+		File classpathJar = this.temporaryFolder.newFile("no-manifest.jar");
+		new ZipOutputStream(new FileOutputStream(classpathJar)).close();
+		return classpathJar.toURI().toURL();
+	}
+
 }