PathMatchingResourcePatternResolver leniently ignores non-existing root directories
This commit is contained in:
parent
3fa533ddd8
commit
784068346d
|
|
@ -570,9 +570,19 @@ public class PathMatchingResourcePatternResolver implements ResourcePatternResol
|
||||||
* @throws IOException if directory contents could not be retrieved
|
* @throws IOException if directory contents could not be retrieved
|
||||||
*/
|
*/
|
||||||
protected Set<File> retrieveMatchingFiles(File rootDir, String pattern) throws IOException {
|
protected Set<File> retrieveMatchingFiles(File rootDir, String pattern) throws IOException {
|
||||||
|
if (!rootDir.exists()) {
|
||||||
|
// Silently skip non-existing directories.
|
||||||
|
if (logger.isDebugEnabled()) {
|
||||||
|
logger.debug("Skipping [" + rootDir.getAbsolutePath() + "] because it does not exist");
|
||||||
|
}
|
||||||
|
return Collections.emptySet();
|
||||||
|
}
|
||||||
if (!rootDir.isDirectory()) {
|
if (!rootDir.isDirectory()) {
|
||||||
throw new IllegalStateException(
|
// Complain louder if it exists but is no directory.
|
||||||
"Resource path [" + rootDir.getAbsolutePath() + "] does not denote a directory");
|
if (logger.isWarnEnabled()) {
|
||||||
|
logger.warn("Skipping [" + rootDir.getAbsolutePath() + "] because it does not denote a directory");
|
||||||
|
}
|
||||||
|
return Collections.emptySet();
|
||||||
}
|
}
|
||||||
if (!rootDir.canRead()) {
|
if (!rootDir.canRead()) {
|
||||||
if (logger.isWarnEnabled()) {
|
if (logger.isWarnEnabled()) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue