svn commit: r782151 - /incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java

[lindner]

Author: lindner
Date: Fri Jun  5 21:49:15 2009
New Revision: 782151

URL: http://svn.apache.org/viewvc?rev=782151&view=rev
Log:
SHINDIG-971 | JsonRpcServlet should set content type to json in all cases, 
including gets and error cases.

Modified:
    
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java

Modified: 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java?rev=782151&r1=782150&r2=782151&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
 (original)
+++ 
incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
 Fri Jun  5 21:49:15 2009
@@ -73,6 +73,9 @@
   @Override
   protected void doGet(HttpServletRequest servletRequest, HttpServletResponse 
servletResponse)
       throws IOException {
+    setCharacterEncodings(servletRequest, servletResponse);
+    servletResponse.setContentType(ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
+
     SecurityToken token = getSecurityToken(servletRequest);
     if (token == null) {
       sendSecurityError(servletResponse);
@@ -80,7 +83,6 @@
     }
 
     try {
-      setCharacterEncodings(servletRequest, servletResponse);
       JSONObject request = JsonConversionUtil.fromRequest(servletRequest);
       dispatch(request, null, servletRequest, servletResponse, token);
     } catch (JSONException je) {
@@ -91,6 +93,9 @@
   @Override
   protected void doPost(HttpServletRequest servletRequest, HttpServletResponse 
servletResponse)
       throws IOException {
+    setCharacterEncodings(servletRequest, servletResponse);
+    servletResponse.setContentType(ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
+
     try {
       checkContentTypes(ALLOWED_CONTENT_TYPES, 
servletRequest.getContentType());
       SecurityToken token = getSecurityToken(servletRequest);
@@ -99,9 +104,6 @@
         return;
       }
 
-      setCharacterEncodings(servletRequest, servletResponse);
-      servletResponse.setContentType(ContentTypes.OUTPUT_JSON_CONTENT_TYPE);
-
       String content = null;
       Map<String, FormDataItem> formItems = new HashMap<String, 
FormDataItem>();