From 621fea935b61b549ae9f547f704d3c75781515ea Mon Sep 17 00:00:00 2001
From: containerAnalyzer <85693199+containerAnalyzer@users.noreply.github.com>
Date: Tue, 15 Jun 2021 22:41:10 +0800
Subject: [PATCH] Fix NPE in XmlConfigurationProvider.java

---
 .../xwork2/config/providers/XmlConfigurationProvider.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
index e02338f9a..8d9699aae 100644
--- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
@@ -1076,8 +1076,12 @@ public abstract class XmlConfigurationProvider implements ConfigurationProvider
                     InputSource in = new InputSource(is);
 
                     in.setSystemId(url.toString());
-
-                    docs.add(DomHelper.parse(in, dtdMappings));
+                    
+                    Document helperDoc = DomHelper.parse(in, dtdMappings);
+                    if (helperDoc != null) {
+                        docs.add(helperDoc);
+                    }
+                    
                     loadedFileUrls.add(url.toString());
                 } catch (StrutsException e) {
                     if (includeElement != null) {