Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
(cherry picked from commit acefd83)
This commit is contained in:
Juergen Hoeller
2014-11-02 11:38:35 +01:00
parent e989b2621f
commit 285dca027b
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-webmvc/src/main/java/org/springframework/web/servlet/view/tiles3/SpringWildcardServletTilesApplicationContext.java
View File

@@ -30,6 +30,7 @@ import org.apache.tiles.request.servlet.ServletApplicationContext;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternResolver;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.support.ServletContextResourcePatternResolver;
@@ -53,22 +54,20 @@ public class SpringWildcardServletTilesApplicationContext extends ServletApplica
@Override
public ApplicationResource getResource(String localePath) {
ApplicationResource retValue = null;
Collection<ApplicationResource> urlSet = getResources(localePath);
if (urlSet != null && !urlSet.isEmpty()) {
retValue = urlSet.iterator().next();
if (!CollectionUtils.isEmpty(urlSet)) {
return urlSet.iterator().next();
}
return retValue;
return null;
}
@Override
public ApplicationResource getResource(ApplicationResource base, Locale locale) {
ApplicationResource retValue = null;
Collection<ApplicationResource> urlSet = getResources(base.getLocalePath(locale));
if (urlSet != null && !urlSet.isEmpty()) {
retValue = urlSet.iterator().next();
if (!CollectionUtils.isEmpty(urlSet)) {
return urlSet.iterator().next();
}
return retValue;
return null;
}
@Override