Merge branch '1.3.x'

2016-04-15 17:33:25 +01:00
parent 06c1dd87c9 b554894bb4
commit 43256ee7c9
2 changed files with 15 additions and 3 deletions
--- a/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java
+++ b/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/restart/ChangeableUrls.java
@@ -118,6 +118,9 @@ final class ChangeableUrls implements Iterable<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)) {