Merge pull request #894 from apache/WW-5364-npe

WW-5364 Fix potential NPE in XmlDocConfigurationProvider
apache · Mar 14, 2024 · 86aee4b · 86aee4b
2 parents e08f637 + 29422e4
commit 86aee4b
Showing 1 changed file with 3 additions and 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
@@ -142,7 +142,9 @@ private void registerAllowlist() {
 
     @Override
     public void destroy() {
-        providerAllowlist.clearAllowlist(this);
+        if (providerAllowlist != null) {
+            providerAllowlist.clearAllowlist(this);
+        }
     }
 
     protected Class<?> allowAndLoadClass(String className) throws ClassNotFoundException {