You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by ya...@apache.org on 2018/06/21 07:31:32 UTC
[struts] branch struts-2-5-x updated: delete redundant code for
performance
This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a commit to branch struts-2-5-x
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/struts-2-5-x by this push:
new a75eddb delete redundant code for performance
a75eddb is described below
commit a75eddb5154f9705bd2bac39f704512c8453e0b9
Author: Yasser Zamani <ya...@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 1e4ecc8..0c58740 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
@@ -146,8 +146,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;
}
}
diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
index 4882804..9d72390 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! -->
@@ -68,7 +63,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" />