Author: hsaputra
Date: Fri Dec 10 01:20:22 2010
New Revision: 1044190
URL: http://svn.apache.org/viewvc?rev=1044190&view=rev
Log:
SHINDIG-1480 | Return the converted error code in DataServiceServlet.sendError
rather than the one from ResponseItem
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java?rev=1044190&r1=1044189&r2=1044190&view=diff
==============================================================================
---
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
(original)
+++
shindig/trunk/java/common/src/main/java/org/apache/shindig/protocol/DataServiceServlet.java
Fri Dec 10 01:20:22 2010
@@ -118,6 +118,7 @@ public class DataServiceServlet extends
@Override
protected void sendError(HttpServletResponse servletResponse, ResponseItem
responseItem)
throws IOException {
+ String errorMessage = responseItem.getErrorMessage();
int errorCode = responseItem.getErrorCode();
if (errorCode < 0) {
// Map JSON-RPC error codes into HTTP error codes as best we can
@@ -141,8 +142,7 @@ public class DataServiceServlet extends
}
}
- servletResponse.sendError(responseItem.getErrorCode(),
- responseItem.getErrorMessage());
+ servletResponse.sendError(errorCode, errorMessage);
}
/**
