You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/05/06 15:53:30 UTC
svn commit: r941730 -
/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
Author: lindner
Date: Thu May 6 13:53:30 2010
New Revision: 941730
URL: http://svn.apache.org/viewvc?rev=941730&view=rev
Log:
clean ups, get rid of invalid json parsing error, causes IIE exceptions
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java?rev=941730&r1=941729&r2=941730&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java Thu May 6 13:53:30 2010
@@ -62,11 +62,6 @@ public class JsonRpcServlet extends ApiS
*/
public static final String REQUEST_PARAM = "request";
- /**
- * Error code for JSON-RPC requests with an error parsing JSON.
- */
- public static final int SC_JSON_PARSE_ERROR = -32700;
-
private MultipartFormParser formParser;
@Inject
@@ -128,7 +123,6 @@ public class JsonRpcServlet extends ApiS
JSONObject request = new JSONObject(content);
dispatch(request, formData, servletRequest, servletResponse, token, callback);
}
- return;
} catch (JSONException je) {
sendJsonParseError(je, servletResponse);
} catch (IllegalArgumentException e) {
@@ -195,7 +189,7 @@ public class JsonRpcServlet extends ApiS
// Generate the output
Writer writer = servletResponse.getWriter();
- if (callback != null) writer.append(callback+'(');
+ if (callback != null) writer.append(callback).append('(');
jsonConverter.append(writer, result);
if (callback != null) writer.append(");\n");
}
@@ -219,7 +213,7 @@ public class JsonRpcServlet extends ApiS
// Generate the output
Writer writer = servletResponse.getWriter();
- if (callback != null) writer.append(callback+'(');
+ if (callback != null) writer.append(callback).append('(');
jsonConverter.append(writer, result);
if (callback != null) writer.append(");\n");
}
@@ -336,7 +330,7 @@ public class JsonRpcServlet extends ApiS
}
private void sendJsonParseError(JSONException e, HttpServletResponse response) throws IOException {
- sendError(response, new ResponseItem(SC_JSON_PARSE_ERROR,
+ sendError(response, new ResponseItem(HttpServletResponse.SC_BAD_REQUEST,
"Invalid JSON - " + e.getMessage()));
}
}