Merge pull request #491 from containerAnalyzer/master

Fix NPE in XmlConfigurationProvider.java
2026-08-11 01:27:14 +00:00 · 2021-06-18 06:54:38 +02:00
parent eab033c7f0 621fea935b
commit d3f07616e3
1 changed files with 6 additions and 2 deletions
@@ -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) {