WW-5406 Fix injection order issue for excluded patterns

apache · Apr 18, 2024 · ad49ea8 · ad49ea8
1 parent 1562e66
commit ad49ea8
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -167,8 +167,9 @@ public class Dispatcher {
      */
     private Pattern multipartValidationPattern = Pattern.compile(MULTIPART_FORM_DATA_REGEX);
 
+    private String actionExcludedPatternsStr;
     private String actionExcludedPatternsSeparator = ",";
-    private List<Pattern> actionExcludedPatterns = emptyList();
+    private List<Pattern> actionExcludedPatterns;
 
     /**
      * Provide list of default configuration files.
@@ -355,18 +356,24 @@ public void setActionExcludedPatternsSeparator(String separator) {
 
     @Inject(value = StrutsConstants.STRUTS_ACTION_EXCLUDE_PATTERN, required = false)
     public void setActionExcludedPatterns(String excludedPatterns) {
-        this.actionExcludedPatterns = buildExcludedPatternsList(excludedPatterns, actionExcludedPatternsSeparator);
+        this.actionExcludedPatternsStr = excludedPatterns;
     }
 
-    private static List<Pattern> buildExcludedPatternsList(String patterns, String separator) {
-        if (patterns == null || patterns.trim().isEmpty()) {
-            return emptyList();
+    public List<Pattern> getActionExcludedPatterns() {
+        if (actionExcludedPatterns == null) {
+            initActionExcludedPatterns();
         }
-        return unmodifiableList(Arrays.stream(patterns.split(separator)).map(String::trim).map(Pattern::compile).collect(toList()));
+        return actionExcludedPatterns;
     }
 
-    public List<Pattern> getActionExcludedPatterns() {
-        return actionExcludedPatterns;
+    private void initActionExcludedPatterns() {
+        if (actionExcludedPatternsStr == null || actionExcludedPatternsStr.trim().isEmpty()) {
+            actionExcludedPatterns = emptyList();
+            return;
+        }
+        actionExcludedPatterns = unmodifiableList(
+                Arrays.stream(actionExcludedPatternsStr.split(actionExcludedPatternsSeparator))
+                        .map(String::trim).map(Pattern::compile).collect(toList()));
     }
 
     @Inject