From 29aae5eb8168c46dc9070f294e9d9b400c0df521 Mon Sep 17 00:00:00 2001 From: Maurizio Cucchiara Date: Wed, 26 Oct 2011 15:06:17 +0000 Subject: [PATCH] WW-3694 - JSONResult - buildSMDObject method is never called internally git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1189257 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/org/apache/struts2/json/JSONResult.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java index aa8d6ae98..1ddf59af6 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java @@ -35,11 +35,9 @@ import org.apache.struts2.json.smd.SMDGenerator; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.List; import java.util.Set; -import java.util.Map; import java.util.regex.Pattern; /** @@ -177,11 +175,10 @@ public class JSONResult implements Result { } private Object readRootObject(ActionInvocation invocation) { - Object root = findRootObject(invocation); if (enableSMD) { - return new SMDGenerator(root, excludeProperties, ignoreInterfaces).generate(invocation); + return buildSMDObject(invocation); } - return root; + return findRootObject(invocation); } private Object findRootObject(ActionInvocation invocation) { @@ -215,7 +212,7 @@ public class JSONResult implements Result { @SuppressWarnings("unchecked") protected org.apache.struts2.json.smd.SMD buildSMDObject(ActionInvocation invocation) { - return new SMDGenerator(readRootObject(invocation), excludeProperties, ignoreInterfaces).generate(invocation); + return new SMDGenerator(findRootObject(invocation), excludeProperties, ignoreInterfaces).generate(invocation); } /**