Repository: struts Updated Branches: refs/heads/master 223e735e3 -> b25fe95ee
WW-4846 Does not traverse/include proxy info in JSONResult Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/fbe09949 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/fbe09949 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/fbe09949 Branch: refs/heads/master Commit: fbe09949c7344d543df84315070bf007a545783c Parents: c9bdb24 Author: Yasser Zamani <yasser.zam...@live.com> Authored: Wed Aug 30 17:55:41 2017 +0430 Committer: Yasser Zamani <yasser.zam...@live.com> Committed: Wed Aug 30 17:55:41 2017 +0430 ---------------------------------------------------------------------- .../json/src/main/java/org/apache/struts2/json/JSONWriter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/fbe09949/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java ---------------------------------------------------------------------- diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java index 20f815c..0e10ccf 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONWriter.java @@ -20,6 +20,7 @@ */ package org.apache.struts2.json; +import com.opensymphony.xwork2.util.ProxyUtil; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.json.annotations.JSON; @@ -210,7 +211,7 @@ public class JSONWriter { BeanInfo info; try { - Class clazz = object.getClass(); + Class clazz = ProxyUtil.ultimateTargetClass(object); info = ((object == this.root) && this.ignoreHierarchy) ? getBeanInfoIgnoreHierarchy(clazz)
