svn commit: r1189257 - /struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
Author: mcucchiara
Date: Wed Oct 26 15:06:17 2011
New Revision: 1189257
URL: http://svn.apache.org/viewvc?rev=1189257&view=rev
Log:
WW-3694 - JSONResult - buildSMDObject method is never called internally
Modified:
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
Modified:
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java?rev=1189257&r1=1189256&r2=1189257&view=diff
==
---
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
(original)
+++
struts/struts2/trunk/plugins/json/src/main/java/org/apache/struts2/json/JSONResult.java
Wed Oct 26 15:06:17 2011
@@ -35,11 +35,9 @@ import org.apache.struts2.json.smd.SMDGe
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 Resul
}
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 Resul
@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);
}
/**
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache Archiva (https://cwiki.apache.org/confluence/display/ARCHIVA) Pages - Archiva Roadmap edited by olamy (04:25 AM) https://cwiki.apache.org/confluence/display/ARCHIVA/Archiva+Roadmap Apache Camel (https://cwiki.apache.org/confluence/display/CAMEL) Pages - Download edited by muellerc (03:50 PM) https://cwiki.apache.org/confluence/display/CAMEL/Download Camel 2.9.0 Release edited by davsclaus (07:24 AM) https://cwiki.apache.org/confluence/display/CAMEL/Camel+2.9.0+Release Scripting Languages Context edited by davsclaus (07:22 AM) https://cwiki.apache.org/confluence/display/CAMEL/Scripting+Languages+Context Apache Felix (https://cwiki.apache.org/confluence/display/FELIX) Pages - Contributing edited by kgilmer (03:02 AM) https://cwiki.apache.org/confluence/display/FELIX/Contributing Apache Felix Light HTTP Service created by kgilmer (02:31 AM) https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Light+HTTP+Service Apache Felix Config Admin edited by kgilmer (02:07 AM) https://cwiki.apache.org/confluence/display/FELIX/Apache+Felix+Config+Admin Apache Hive (https://cwiki.apache.org/confluence/display/Hive) Pages - PhabricatorCodeReview created by jvs (08:31 PM) https://cwiki.apache.org/confluence/display/Hive/PhabricatorCodeReview Apache Mahout (https://cwiki.apache.org/confluence/display/MAHOUT) Pages - Collections edited by gsingers (05:14 PM) https://cwiki.apache.org/confluence/display/MAHOUT/Collections Visualizing Sample Clusters edited by lancenorskog (02:59 AM) https://cwiki.apache.org/confluence/display/MAHOUT/Visualizing+Sample+Clusters Apache MRUnit (https://cwiki.apache.org/confluence/display/MRUNIT) Pages - How to Release edited by bro...@gmail.com (11:08 AM) https://cwiki.apache.org/confluence/display/MRUNIT/How+to+Release Apache OpenOffice.org Community (https://cwiki.apache.org/confluence/display/OOOUSERS) Pages - Mailing lists edited by tjfrazier (09:59 PM) https://cwiki.apache.org/confluence/display/OOOUSERS/Mailing+lists Email Migration Post edited by robweir (10:32 AM) https://cwiki.apache.org/confluence/display/OOOUSERS/Email+Migration+Post Comments https://cwiki.apache.org/confluence/display/OOOUSERS/OpenOffice.org+Email+Forwarder (1) https://cwiki.apache.org/confluence/display/OOOUSERS/Mailing+lists (2) Apache OpenNLP (https://cwiki.apache.org/confluence/display/OPENNLP) Pages - TestPlan1.5.2 edited by joern (09:43 AM) https://cwiki.apache.org/confluence/display/OPENNLP/TestPlan1.5.2 Apache Sqoop (https://cwiki.apache.org/confluence/display/SQOOP) Pages - Namespace Migration created by arvind (03:41 PM) https://cwiki.apache.org/confluence/display/SQOOP/Namespace+Migration Home edited by arvind (01:02 PM) https://cwiki.apache.org/confluence/display/SQOOP/Home Apache Tapestry (https://cwiki.apache.org/confluence/display/TAPESTRY) Pages - Configuration edited by hlship (05:54 PM) https://cwiki.apache.org/confluence/display/TAPESTRY/Configuration Class Reloading edited by hlship (05:46 PM) https://cwiki.apache.org/confluence/display/TAPESTRY/Class+Reloading Apache Struts 2 Documentation (https://cwiki.apache.org/confluence/display/WW) Pages - Why would we want to create Action objects from the Spring configuration edited by jeffblack360 (03:49 PM) https://cwiki.apache.org/confluence/display/WW/Why+would+we+want+to+create+Action+objects+from+the+Spring+configuration Multiple Submit Buttons edited by jeffblack360 (03:35 PM) https://cwiki.apache.org/confluence/display/WW/Multiple+Submit+Buttons Parameters in configuration results edited by jeffblack360 (03:29 PM) https://cwiki.apache.org/confluence/display/WW/Parameters+in+configuration+results Performance Tuning edited by phil (05:44 AM) https://cwiki.apache.org/confluence/display/WW/Performance+Tuning Change your notification preferences: https://cwiki.apache.org/confluence/users/viewnotifications.action
