root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Properly extract jar file from Tomcat war URL 

Issue: SPR-15485
This commit is contained in:
Juergen Hoeller 2017-05-03 21:58:59 +02:00
parent 4d86515fa5
commit d43dfc7bae
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -576,10 +576,13 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
// We'll also handle paths with and without leading "file:" prefix. // We'll also handle paths with and without leading "file:" prefix.
String urlFile = rootDirURL.getFile(); String urlFile = rootDirURL.getFile();
try { 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) { if (separatorIndex != -1) {
jarFileUrl = urlFile.substring(0, separatorIndex); 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); jarFile = getJarFile(jarFileUrl);
} }
else { else {