aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2016-11-01 14:32:36 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2016-11-01 14:33:13 +1300
commit5e5b32f8ed85899a97236906fda13a6937e913c1 (patch)
treec0aa14c979855db8205718ef01c4a2ca9fb55baf
parent121b837010c3cf89d3188a6cba1a202baf7ad6e2 (diff)
downloadtrackermap-server-5e5b32f8ed85899a97236906fda13a6937e913c1.tar.gz
trackermap-server-5e5b32f8ed85899a97236906fda13a6937e913c1.tar.bz2
trackermap-server-5e5b32f8ed85899a97236906fda13a6937e913c1.zip
Update resource error handling
-rw-r--r--src/org/traccar/api/ResourceErrorHandler.java22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/org/traccar/api/ResourceErrorHandler.java b/src/org/traccar/api/ResourceErrorHandler.java
index be63aad09..2f0c21a63 100644
--- a/src/org/traccar/api/ResourceErrorHandler.java
+++ b/src/org/traccar/api/ResourceErrorHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2015 - 2016 Anton Tananaev (anton.tananaev@gmail.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -20,24 +20,22 @@ import org.traccar.helper.Log;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
import javax.ws.rs.ext.ExceptionMapper;
-import java.util.HashMap;
-import java.util.Map;
public class ResourceErrorHandler implements ExceptionMapper<Exception> {
- private static final String KEY_MESSAGE = "message";
- private static final String KEY_DETAILS = "details";
-
@Override
public Response toResponse(Exception e) {
- Map<String, String> error = new HashMap<>();
if (e instanceof WebApplicationException) {
- WebApplicationException webApplicationException = (WebApplicationException) e;
- return Response.status(webApplicationException.getResponse().getStatus()).entity(error).build();
+ WebApplicationException exception = (WebApplicationException) e;
+ String message;
+ if (exception.getCause() != null) {
+ message = Log.exceptionStack(exception.getCause());
+ } else {
+ message = Log.exceptionStack(exception);
+ }
+ return Response.fromResponse(exception.getResponse()).entity(message).build();
} else {
- error.put(KEY_MESSAGE, e.getMessage());
- error.put(KEY_DETAILS, Log.exceptionStack(e));
- return Response.status(Response.Status.BAD_REQUEST).entity(error).build();
+ return Response.status(Response.Status.BAD_REQUEST).entity(Log.exceptionStack(e)).build();
}
}