TilesConfigurer defensively expects null from getResources in case of no resources found

Also includes order preservation for resource results with Tiles 2 as well as retrieval failure logging with Tiles 3.

Issue: SPR-12362
(cherry picked from commit cb86036)
This commit is contained in:
Juergen Hoeller
2014-11-01 12:55:53 +01:00
parent aa82da8507
commit c8b8dc5f97
4 changed files with 32 additions and 20 deletions

View File

@@ -18,7 +18,7 @@ package org.springframework.web.servlet.view.tiles2;
import java.io.IOException;
import java.net.URL;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
import javax.servlet.ServletContext;
@@ -26,6 +26,7 @@ import org.apache.tiles.servlet.context.ServletTilesApplicationContext;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.support.ServletContextResourcePatternResolver;
/**
@@ -59,8 +60,8 @@ public class SpringWildcardServletTilesApplicationContext extends ServletTilesAp
public Set<URL> getResources(String path) throws IOException {
Set<URL> urlSet = null;
Resource[] resources = this.resolver.getResources(path);
if (resources != null && resources.length > 0) {
urlSet = new HashSet<URL>();
if (!ObjectUtils.isEmpty(resources)) {
urlSet = new LinkedHashSet<URL>(resources.length);
for (Resource resource : resources) {
urlSet.add(resource.getURL());
}

View File

@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.servlet.ServletContext;
import javax.servlet.jsp.JspFactory;
@@ -307,7 +308,10 @@ public class TilesConfigurer implements ServletContextAware, InitializingBean, D
try {
List<URL> result = new LinkedList<URL>();
for (String definition : definitions) {
result.addAll(applicationContext.getResources(definition));
Set<URL> resources = applicationContext.getResources(definition);
if (resources != null) {
result.addAll(resources);
}
}
return result;
}