Return HTTP 204 on successful delete object

Found with Ceph s3-tests.  References #5.
pull/16/head
Andrew Gaul 2014-07-29 08:02:53 -07:00
rodzic cf1376387c
commit 7c5f219535
1 zmienionych plików z 5 dodań i 8 usunięć

Wyświetl plik

@ -92,10 +92,7 @@ final class S3ProxyHandler extends AbstractHandler {
return;
} else {
String[] path = uri.split("/", 3);
errorCode = handleBlobRemove(response, path[1], path[2]);
if (errorCode != HttpServletResponse.SC_OK) {
response.sendError(errorCode);
}
handleBlobRemove(response, path[1], path[2]);
baseRequest.setHandled(true);
return;
}
@ -421,15 +418,15 @@ final class S3ProxyHandler extends AbstractHandler {
}
}
private int handleBlobRemove(HttpServletResponse response,
String containerName, String blobName) {
private void handleBlobRemove(HttpServletResponse response,
String containerName, String blobName) throws IOException {
try {
blobStore.removeBlob(containerName, blobName);
return HttpServletResponse.SC_OK;
response.sendError(HttpServletResponse.SC_NO_CONTENT);
} catch (RuntimeException re) {
logger.error("Error removing blob {} {}: {}", containerName,
blobName, re.getMessage());
return HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
}