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-5293 Fix trying to clear immutable list

Browse Source
This commit is contained in:
Kusal Kithul-Godage
2023-03-07 14:31:34 +11:00
parent 7fa67c290e
commit c27cf4833a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+4 -4
View File
@@ -94,13 +94,13 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid
public void init(Configuration configuration) {
super.init(configuration);
includedFileNames = configuration.getLoadedFileNames();
loadDocuments(configFileName);
documents = parseFile(configFileName);
}
@Override
public void loadPackages() throws ConfigurationException {
super.loadPackages();
documents.clear();
documents = emptyList();
}
@Override
@@ -120,10 +120,10 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid
return loadedFileUrls.stream().anyMatch(url -> fileManager.fileNeedsReloading(url));
}
private void loadDocuments(String configFileName) {
private List<Document> parseFile(String configFileName) {
try {
loadedFileUrls.clear();
documents = loadConfigurationFiles(configFileName, null);
return loadConfigurationFiles(configFileName, null);
} catch (ConfigurationException e) {
throw e;
} catch (Exception e) {