(struts) branch WW-5364-npe created (now 29422e47f)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5364-npe in repository https://gitbox.apache.org/repos/asf/struts.git at 29422e47f WW-5364 Fix potential NPE in XmlDocConfigurationProvider This branch includes the following new commits: new 29422e47f WW-5364 Fix potential NPE in XmlDocConfigurationProvider The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts) 01/01: WW-5364 Fix potential NPE in XmlDocConfigurationProvider
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5364-npe
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 29422e47fe9a4aa85edf3c02836de847a3f62ea9
Author: Kusal Kithul-Godage
AuthorDate: Wed Mar 13 21:49:27 2024 +1100
WW-5364 Fix potential NPE in XmlDocConfigurationProvider
---
.../xwork2/config/providers/XmlDocConfigurationProvider.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
index bae553789..cad52fb79 100644
---
a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
+++
b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
@@ -142,7 +142,9 @@ public abstract class XmlDocConfigurationProvider
implements ConfigurationProvid
@Override
public void destroy() {
-providerAllowlist.clearAllowlist(this);
+if (providerAllowlist != null) {
+providerAllowlist.clearAllowlist(this);
+}
}
protected Class allowAndLoadClass(String className) throws
ClassNotFoundException {
(struts) branch master updated (e08f637be -> 86aee4b0e)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from e08f637be Merge pull request #892 from apache/feature/WW-5401-logging add 29422e47f WW-5364 Fix potential NPE in XmlDocConfigurationProvider new 86aee4b0e Merge pull request #894 from apache/WW-5364-npe The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../xwork2/config/providers/XmlDocConfigurationProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
(struts) 01/01: Merge pull request #894 from apache/WW-5364-npe
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 86aee4b0eaa814be92e3c3a47e51f2adf1cab5e7 Merge: e08f637be 29422e47f Author: Kusal Kithul-Godage AuthorDate: Thu Mar 14 15:48:48 2024 +1100 Merge pull request #894 from apache/WW-5364-npe WW-5364 Fix potential NPE in XmlDocConfigurationProvider .../xwork2/config/providers/XmlDocConfigurationProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
(struts) branch WW-5364-npe deleted (was 29422e47f)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5364-npe in repository https://gitbox.apache.org/repos/asf/struts.git was 29422e47f WW-5364 Fix potential NPE in XmlDocConfigurationProvider The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
