Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-4743 NPE in StrutsTilesContainerFactory when resource isn't found

Browse Source
This commit is contained in:
Aleksandr Mashchenko
2017-02-13 20:15:18 +02:00
parent f22873e127
commit a399932ae9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+5 -1
View File
@@ -190,9 +190,13 @@ public class StrutsTilesContainerFactory extends BasicTilesContainerFactory {
resources.addAll(applicationContext.getResources(definition));
}
if (resources.contains(null)) {
LOG.warn("Some resources were not found. Definitions: {}. Found resources: {}", definitions, resources);
}
List<ApplicationResource> filteredResources = new ArrayList<>();
for (ApplicationResource resource : resources) {
if (Locale.ROOT.equals(resource.getLocale())) {
if (resource != null && Locale.ROOT.equals(resource.getLocale())) {
filteredResources.add(resource);
}
}