[struts] 09/13: delete redundant code for performance

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/struts.git

commit 6af8531ceae159bca27b9c5bb2e41aa39a0e86ec
Author: Yasser Zamani <yasserzam...@apache.org>
AuthorDate: Thu Jun 21 12:00:46 2018 +0430

    delete redundant code for performance
---
 .../java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java   | 3 +--
 core/src/main/resources/struts-default.xml                        | 8 ++------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git 
a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java 
b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 5d87944..9a04eac 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -168,8 +168,7 @@ public class SecurityMemberAccess implements MemberAccess {
         memberPackageName = memberPackageName + ".";
 
         for (String packageName: excludedPackageNames) {
-            if (targetPackageName.startsWith(packageName) || 
targetPackageName.equals(packageName)
-                    || memberPackageName.startsWith(packageName) || 
memberPackageName.equals(packageName)) {
+            if (targetPackageName.startsWith(packageName) || 
memberPackageName.startsWith(packageName)) {
                 return true;
             }
         }
diff --git a/core/src/main/resources/struts-default.xml 
b/core/src/main/resources/struts-default.xml
index 84605fa..abd6c65 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -45,11 +45,6 @@
                 java.lang.ClassLoader,
                 java.lang.Shutdown,
                 java.lang.ProcessBuilder,
-                ognl.OgnlContext,
-                ognl.ClassResolver,
-                ognl.TypeConverter,
-                ognl.MemberAccess,
-                ognl.DefaultMemberAccess,
                 com.opensymphony.xwork2.ActionContext" />
 
     <!-- this must be valid regex, each '.' in package name must be escaped! 
-->
@@ -71,7 +66,8 @@
                 sun.reflect.,
                 javassist.,
                 com.opensymphony.xwork2.ognl.,
-                com.opensymphony.xwork2.security." />
+                com.opensymphony.xwork2.security.,
+                com.opensymphony.xwork2.util." />
 
     <bean class="com.opensymphony.xwork2.ObjectFactory" name="struts"/>
     <bean type="com.opensymphony.xwork2.factory.ResultFactory" name="struts" 
class="org.apache.struts2.factory.StrutsResultFactory" />