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 08:51:50 UTC
[struts] branch support-2-3 updated: delete redundant code for
performance
This is an automated email from the ASF dual-hosted git repository.
yasserzamani pushed a commit to branch support-2-3
in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/support-2-3 by this push:
new c59f294 delete redundant code for performance
c59f294 is described below
commit c59f294fb98d9cb7fb82fd7124d5d8df0ab2e252
Author: Yasser Zamani <ya...@apache.org>
AuthorDate: Thu Jun 21 13:20:48 2018 +0430
delete redundant code for performance
---
core/src/main/resources/struts-default.xml | 9 +++------
.../java/com/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 15bd60e..c761b7f 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 4d2ebcb..013b6c5 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;
}
}