Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-3694 - JSONResult - buildSMDObject method is never called internally

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1189257 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Maurizio Cucchiara
2011-10-26 15:06:17 +00:00
parent d5cbcfeedc
commit 29aae5eb81
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
+3 -6
View File
@@ -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);
}
/**