Fixes conflicts after cherry-picked changes from 2.5.x branch

apache · Aug 24, 2018 · 0fb7daf · 0fb7daf
1 parent 2f3d33a
commit 0fb7daf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java
@@ -99,7 +99,7 @@ public void setEnableEvalExpression(String evalExpression) {
         }
     }
 
-    @Inject(value = XWorkConstants.OGNL_EXCLUDED_CLASSES, required = false)
+    @Inject(value = StrutsConstants.STRUTS_EXCLUDED_CLASSES, required = false)
     public void setExcludedClasses(String commaDelimitedClasses) {
         Set<Class<?>> excludedClasses = new HashSet<>();
         excludedClasses.addAll(this.excludedClasses);
@@ -122,7 +122,7 @@ private Set<Class<?>> parseExcludedClasses(String commaDelimitedClasses) {
         return classes;
     }
 
-    @Inject(value = XWorkConstants.OGNL_EXCLUDED_PACKAGE_NAME_PATTERNS, required = false)
+    @Inject(value = StrutsConstants.STRUTS_EXCLUDED_PACKAGE_NAME_PATTERNS, required = false)
     public void setExcludedPackageNamePatterns(String commaDelimitedPackagePatterns) {
         Set<Pattern> excludedPackageNamePatterns = new HashSet<>();
         excludedPackageNamePatterns.addAll(this.excludedPackageNamePatterns);
@@ -141,7 +141,7 @@ private Set<Pattern> parseExcludedPackageNamePatterns(String commaDelimitedPacka
         return packageNamePatterns;
     }
 
-    @Inject(value = XWorkConstants.OGNL_EXCLUDED_PACKAGE_NAMES, required = false)
+    @Inject(value = StrutsConstants.STRUTS_EXCLUDED_PACKAGE_NAMES, required = false)
     public void setExcludedPackageNames(String commaDelimitedPackageNames) {
         Set<String> excludedPackageNames = new HashSet<>();
         excludedPackageNames.addAll(this.excludedPackageNames);