zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-12 22:38:16 +02:00
Code Issues Projects Releases Packages Wiki Activity

Correctly set HTTP error status codes when list objects fails

Browse source 
This makes the associated nomulus tool commands correctly return error
exit codes when the server-side component fails. This improves
scriptability.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140543216
This commit is contained in:
mcilwain 2016-11-29 16:30:19 -08:00 • committed by Ben McIlwain
parent b35ac10b7e
commit 5f32d1bbeb
8 changed files with 31 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
java/google/registry/tools/server/ListObjectsAction.java
View file

@ -15,6 +15,8 @@
package google.registry.tools.server;
import static com.google.common.base.Preconditions.checkArgument;
import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
import com.google.common.base.Function;
import com.google.common.base.Functions;
@ -120,6 +122,8 @@ public abstract class ListObjectsAction<T extends ImmutableObject> implements Ru
if (message == null) {
message = e.getClass().getName();
}
response.setStatus(
e instanceof IllegalArgumentException ? SC_BAD_REQUEST : SC_INTERNAL_SERVER_ERROR);
response.setPayload(ImmutableMap.of(
"error", message,
"status", "error"));