PathMatchingResourcePatternResolver's findPathMatchingResources needs to check for VFS before checking isJarResource

Issue: SPR-11887
master
Juergen Hoeller 10 years ago
parent 03f3412434
commit dfc370c368
  1. 8
      spring-core/src/main/java/org/springframework/core/io/support/PathMatchingResourcePatternResolver.java

@ -343,12 +343,12 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
Set<Resource> result = new LinkedHashSet<Resource>(16); Set<Resource> result = new LinkedHashSet<Resource>(16);
for (Resource rootDirResource : rootDirResources) { for (Resource rootDirResource : rootDirResources) {
rootDirResource = resolveRootDirResource(rootDirResource); rootDirResource = resolveRootDirResource(rootDirResource);
if (isJarResource(rootDirResource)) { if (rootDirResource.getURL().getProtocol().startsWith(ResourceUtils.URL_PROTOCOL_VFS)) {
result.addAll(doFindPathMatchingJarResources(rootDirResource, subPattern));
}
else if (rootDirResource.getURL().getProtocol().startsWith(ResourceUtils.URL_PROTOCOL_VFS)) {
result.addAll(VfsResourceMatchingDelegate.findMatchingResources(rootDirResource, subPattern, getPathMatcher())); result.addAll(VfsResourceMatchingDelegate.findMatchingResources(rootDirResource, subPattern, getPathMatcher()));
} }
else if (isJarResource(rootDirResource)) {
result.addAll(doFindPathMatchingJarResources(rootDirResource, subPattern));
}
else { else {
result.addAll(doFindPathMatchingFileResources(rootDirResource, subPattern)); result.addAll(doFindPathMatchingFileResources(rootDirResource, subPattern));
} }

Loading…
Cancel
Save