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);
}
/**
