From 331b42cdcff687c3a95747877e053b7ccb6fc89c Mon Sep 17 00:00:00 2001 From: John Lindal Date: Tue, 8 Feb 2011 20:23:12 +0000 Subject: [PATCH] WW-3570 slot for debugging information in RPCResponse git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@1068552 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/struts2/json/rpc/RPCResponse.java | 9 +++++++++ .../test/resources/org/apache/struts2/json/smd-11.txt | 1 + .../test/resources/org/apache/struts2/json/smd-12.txt | 1 + .../test/resources/org/apache/struts2/json/smd-13.txt | 1 + 4 files changed, 12 insertions(+) diff --git a/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCResponse.java b/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCResponse.java index 24b2537e1..fe72dce4d 100644 --- a/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCResponse.java +++ b/plugins/json/src/main/java/org/apache/struts2/json/rpc/RPCResponse.java @@ -27,6 +27,7 @@ public class RPCResponse { private String id; private Object result; private RPCError error; + private String debug; public String getId() { return id; @@ -51,4 +52,12 @@ public class RPCResponse { public void setError(RPCError error) { this.error = error; } + + public String getDebug() { + return debug; + } + + public void setDebug(String debugInfo) { + this.debug = debug; + } } diff --git a/plugins/json/src/test/resources/org/apache/struts2/json/smd-11.txt b/plugins/json/src/test/resources/org/apache/struts2/json/smd-11.txt index 11b9489d3..818d19b24 100644 --- a/plugins/json/src/test/resources/org/apache/struts2/json/smd-11.txt +++ b/plugins/json/src/test/resources/org/apache/struts2/json/smd-11.txt @@ -1,4 +1,5 @@ { + "debug":null, "error":null, "id":"2", "result":null diff --git a/plugins/json/src/test/resources/org/apache/struts2/json/smd-12.txt b/plugins/json/src/test/resources/org/apache/struts2/json/smd-12.txt index 357d0d0ce..ccf5e4cf4 100644 --- a/plugins/json/src/test/resources/org/apache/struts2/json/smd-12.txt +++ b/plugins/json/src/test/resources/org/apache/struts2/json/smd-12.txt @@ -1,4 +1,5 @@ { + "debug":null, "error":null, "id":"15", "result": { diff --git a/plugins/json/src/test/resources/org/apache/struts2/json/smd-13.txt b/plugins/json/src/test/resources/org/apache/struts2/json/smd-13.txt index 58eca3363..63a37df17 100644 --- a/plugins/json/src/test/resources/org/apache/struts2/json/smd-13.txt +++ b/plugins/json/src/test/resources/org/apache/struts2/json/smd-13.txt @@ -1,4 +1,5 @@ { + "debug": null, "error": { "code":100, "message": "'method' is required for JSON RPC",