From c59f294fb98d9cb7fb82fd7124d5d8df0ab2e252 Mon Sep 17 00:00:00 2001
From: Yasser Zamani <yasserzamani@apache.org>
Date: Thu, 21 Jun 2018 13:20:48 +0430
Subject: [PATCH] delete redundant code for performance

---
 core/src/main/resources/struts-default.xml               | 9 +++------
 .../opensymphony/xwork2/ognl/SecurityMemberAccess.java   | 3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 15bd60ea1..c761b7ff6 100644
--- a/core/src/main/resources/struts-default.xml
+++ b/core/src/main/resources/struts-default.xml
@@ -47,11 +47,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! -->
@@ -66,10 +61,12 @@
                 freemarker.core.,
                 freemarker.template.,
                 freemarker.ext.rhino.,
+                freemarker.ext.beans.,
                 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" />
diff --git a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
index 4d2ebcb06..013b6c5ec 100644
--- a/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -153,8 +153,7 @@ public class SecurityMemberAccess extends DefaultMemberAccess {
         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;
             }
         }