Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.3.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2016-04-12 14:06:06 +01:00
parent a192970fb3 1412eaa0e0
commit 43d30cc5bc
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,7 @@ final class ChangeableUrls implements Iterable<URL> {
return Collections.<URL>emptyList();
}
try {
return getUrlsFromClassPathAttribute(jarFile.getManifest());
return getUrlsFromClassPathAttribute(url, jarFile.getManifest());
}
catch (IOException ex) {
throw new IllegalStateException(
@@ -117,7 +117,7 @@ final class ChangeableUrls implements Iterable<URL> {
return null;
}
private static List<URL> getUrlsFromClassPathAttribute(Manifest manifest) {
private static List<URL> getUrlsFromClassPathAttribute(URL base, Manifest manifest) {
String classPath = manifest.getMainAttributes()
.getValue(Attributes.Name.CLASS_PATH);
if (!StringUtils.hasText(classPath)) {
@@ -127,7 +127,7 @@ final class ChangeableUrls implements Iterable<URL> {
List<URL> urls = new ArrayList<URL>(entries.length);
for (String entry : entries) {
try {
urls.add(new URL(entry));
urls.add(new URL(base, entry));
}
catch (MalformedURLException ex) {
throw new IllegalStateException(