diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index f9c9ff450..56621a729 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -50,6 +50,9 @@ ognl.MemberAccess, ognl.ClassResolver, ognl.TypeConverter, + ognl.MemberAccess, + ognl.DefaultMemberAccess, + com.opensymphony.xwork2.ognl.SecurityMemberAccess, com.opensymphony.xwork2.ActionContext" /> diff --git a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java index 50bf5767f..6c141aaff 100644 --- a/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java +++ b/core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java @@ -657,8 +657,7 @@ public class URLTagTest extends AbstractUITagTest { tag.doEndTag(); Object allowMethodAccess = stack.findValue("\u0023_memberAccess['allowStaticMethodAccess']"); - assertNotNull(allowMethodAccess); - assertEquals(Boolean.FALSE, allowMethodAccess); + assertNull(allowMethodAccess); assertNull(session.get("foo"));