commit 621fea935b61b549ae9f547f704d3c75781515ea
author containerAnalyzer <85693199+containerAnalyzer@users.noreply.github.com> Tue Jun 15 22:41:10 2021 +0800
committer GitHub <noreply@github.com> Tue Jun 15 22:41:10 2021 +0800
tree f8a1c098aef6c9187d196abb87debdc4e9fa413d
parent eab033c7f057bd587cdc7a0d609bed4226612685

Fix NPE in XmlConfigurationProvider.java

core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java

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 e02338f..8d9699a 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 @@
                     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) {