You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by do...@apache.org on 2008/08/26 22:57:50 UTC

svn commit: r689222 - in /incubator/shindig/trunk: features/opensocial-current/jsonrpccontainer.js java/social-api/src/main/java/org/apache/shindig/social/ResponseError.java

Author: doll
Date: Tue Aug 26 13:57:49 2008
New Revision: 689222

URL: http://svn.apache.org/viewvc?rev=689222&view=rev
Log:
Added support for the limitExceeded error into the java code. 


Modified:
    incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
    incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseError.java

Modified: incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js?rev=689222&r1=689221&r2=689222&view=diff
==============================================================================
--- incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js (original)
+++ incubator/shindig/trunk/features/opensocial-current/jsonrpccontainer.js Tue Aug 26 13:57:49 2008
@@ -166,9 +166,8 @@
     return opensocial.ResponseItem.Error.INTERNAL_ERROR;
   } else if (httpError == "Error 404") {
     return opensocial.ResponseItem.Error.BAD_REQUEST;
-  // TODO: Which one should the limit exceeded error be?
-    // } else if (httpError == "Error ???") {
-    //   return opensocial.ResponseItem.Error.LIMIT_EXCEEDED;
+  } else if (httpError == "Error 417") {
+    return opensocial.ResponseItem.Error.LIMIT_EXCEEDED;
   }
 };
 

Modified: incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseError.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseError.java?rev=689222&r1=689221&r2=689222&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseError.java (original)
+++ incubator/shindig/trunk/java/social-api/src/main/java/org/apache/shindig/social/ResponseError.java Tue Aug 26 13:57:49 2008
@@ -24,7 +24,8 @@
   UNAUTHORIZED("unauthorized", HttpServletResponse.SC_UNAUTHORIZED),
   FORBIDDEN("forbidden", HttpServletResponse.SC_FORBIDDEN),
   BAD_REQUEST("badRequest", HttpServletResponse.SC_BAD_REQUEST),
-  INTERNAL_ERROR("internalError", HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+  INTERNAL_ERROR("internalError", HttpServletResponse.SC_INTERNAL_SERVER_ERROR),
+  LIMIT_EXCEEDED("limitExceeded", HttpServletResponse.SC_EXPECTATION_FAILED);
 
   private final String jsonValue;
   private int httpErrorCode;