Browse Source

Properly extract jar file from Tomcat war URL

Issue: SPR-15485
pull/1418/head
Juergen Hoeller 9 years ago
parent
commit
d43dfc7bae
  1. 7
      spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java

7
spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java

@ -576,10 +576,13 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol @@ -576,10 +576,13 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
// We'll also handle paths with and without leading "file:" prefix.
String urlFile = rootDirURL.getFile();
try {
int separatorIndex = urlFile.indexOf(ResourceUtils.JAR_URL_SEPARATOR);
int separatorIndex = urlFile.indexOf(ResourceUtils.WAR_URL_SEPARATOR);
if (separatorIndex == -1) {
separatorIndex = urlFile.indexOf(ResourceUtils.JAR_URL_SEPARATOR);
}
if (separatorIndex != -1) {
jarFileUrl = urlFile.substring(0, separatorIndex);
rootEntryPath = urlFile.substring(separatorIndex + ResourceUtils.JAR_URL_SEPARATOR.length());
rootEntryPath = urlFile.substring(separatorIndex + 2); // both separators are 2 chars
jarFile = getJarFile(jarFileUrl);
}
else {

Loading…
Cancel
Save