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/12 02:35:23 UTC
svn commit: r943347 - in
/shindig/trunk/java/common/src/main/java/org/apache/shindig:
auth/DefaultSecurityTokenDecoder.java protocol/JsonRpcServlet.java
Author: lindner
Date: Wed May 12 00:35:23 2010
New Revision: 943347
URL: http://svn.apache.org/viewvc?rev=943347&view=rev
Log:
small fixes
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/JsonRpcServlet.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java?rev=943347&r1=943346&r2=943347&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/auth/DefaultSecurityTokenDecoder.java Wed May 12 00:35:23 2010
@@ -67,6 +67,9 @@ public class DefaultSecurityTokenDecoder
}
public String encodeToken(SecurityToken token) throws SecurityTokenException {
+ if (token == null) {
+ return null;
+ }
return decoder.encodeToken(token);
}
}
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=943347&r1=943346&r2=943347&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 Wed May 12 00:35:23 2010
@@ -79,7 +79,8 @@ public class JsonRpcServlet extends ApiS
String method = servletRequest.getMethod();
if (!("GET".equals(method) || "POST".equals(method))) {
- sendError(servletResponse, new ResponseItem(HttpServletResponse.SC_BAD_REQUEST, "Only POST/GET"));
+ sendError(servletResponse,
+ new ResponseItem(HttpServletResponse.SC_BAD_REQUEST, "Only POST/GET Allowed"));
return;
}