From a399932ae9903167d1ee647b141cc98fdf83ef6f Mon Sep 17 00:00:00 2001
From: Aleksandr Mashchenko <amashchenko@apache.org>
Date: Mon, 13 Feb 2017 20:15:18 +0200
Subject: [PATCH] WW-4743 NPE in StrutsTilesContainerFactory when resource
 isn't found

---
 .../apache/struts2/tiles/StrutsTilesContainerFactory.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
index f1c8bbb11..b7564a943 100644
--- a/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
+++ b/plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
@@ -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);
             }
         }