GUACAMOLE-504: Add method for WebSocket status, and reconfigure REST API to use new HTTP method.

This commit is contained in:
Nick Couchman
2018-02-08 09:44:19 -05:00
parent 5239a83acc
commit 0c5b3012ac
2 changed files with 13 additions and 1 deletions

View File

@@ -80,5 +80,17 @@ public class GuacamoleException extends Exception {
public int getHttpStatusCode() { public int getHttpStatusCode() {
return getStatus().getHttpStatusCode(); return getStatus().getHttpStatusCode();
} }
/**
* Returns the most applicable WebSocket status code that can be
* associated with this exception.
*
* @return
* An integer representing the most applicable WebSocket status
* code associated with this exception.
*/
public int getWebSocketCode() {
return getStatus().getWebSocketCode();
}
} }

View File

@@ -173,7 +173,7 @@ public class RESTExceptionWrapper implements MethodInterceptor {
// Translate GuacamoleException subclasses to HTTP error codes // Translate GuacamoleException subclasses to HTTP error codes
catch (GuacamoleException e) { catch (GuacamoleException e) {
throw new APIException( throw new APIException(
Response.Status.fromStatusCode(e.getStatus().getHttpStatusCode()), Response.Status.fromStatusCode(e.getHttpStatusCode()),
e e
); );
} }