safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-05 20:57:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-499: Merge simplification of REST API error handling, leveraging the status codes built into GuacamolException subclasses.

Browse Source
This commit is contained in:
Michael Jumper
2018-02-03 21:35:54 -08:00
parent e2e166d2d7 d889352941
commit 6db2539569
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
guacamole/src/main/java/org/apache/guacamole/rest/RESTExceptionWrapper.java
View File

@@ -171,17 +171,11 @@ public class RESTExceptionWrapper implements MethodInterceptor {
}
// Translate GuacamoleException subclasses to HTTP error codes
catch (GuacamoleSecurityException e) {
throw new APIException(Response.Status.FORBIDDEN, e);
}
catch (GuacamoleResourceNotFoundException e) {
throw new APIException(Response.Status.NOT_FOUND, e);
}
catch (GuacamoleClientException e) {
throw new APIException(Response.Status.BAD_REQUEST, e);
}
catch (GuacamoleException e) {
throw new APIException(Response.Status.INTERNAL_SERVER_ERROR, e);
throw new APIException(
Response.Status.fromStatusCode(e.getStatus().getHttpStatusCode()),
e
);
}
// Rethrow unchecked exceptions such that they are properly wrapped