You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2010/10/28 21:53:47 UTC
svn commit: r1028450 -
/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
Author: lresende
Date: Thu Oct 28 19:53:47 2010
New Revision: 1028450
URL: http://svn.apache.org/viewvc?rev=1028450&view=rev
Log:
Handling null return values in JSON-RPC binding
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java?rev=1028450&r1=1028449&r2=1028450&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonrpc/provider/JSONRPCServiceServlet.java Thu Oct 28 19:53:47 2010
@@ -344,7 +344,13 @@ public class JSONRPCServiceServlet exten
try {
result = responseMessage.getBody();
JSONObject jsonResponse = new JSONObject();
- jsonResponse.put("result", result);
+ //JSONObject put will remove the entry if it's value is null
+ //and per javadoc, we should pass JSONObject.NULL
+ if(result == null) {
+ jsonResponse.put("result", JSONObject.NULL);
+ } else {
+ jsonResponse.put("result", result);
+ }
jsonResponse.putOpt("id", id);
//get response to send to client
return jsonResponse.toString().getBytes("UTF-8");