From e996a5a2994b30004aaea32f0711ddab102f4518 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Sat, 10 Feb 2018 14:41:37 -0500 Subject: [PATCH] GUACAMOLE-504: Avoid unnecessary use of instanceof. --- .../servlet/GuacamoleHTTPTunnelServlet.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java index 4845f9071..be2da1312 100644 --- a/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java +++ b/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java @@ -259,18 +259,16 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet { // Catch any thrown guacamole exception and attempt to pass within the // HTTP response, logging each error appropriately. + catch (GuacamoleClientException e) { + logger.warn("HTTP tunnel request rejected: {}", e.getMessage()); + sendError(response, e.getStatus().getGuacamoleStatusCode(), + e.getStatus().getHttpStatusCode(), e.getMessage()); + } catch (GuacamoleException e) { - if (e instanceof GuacamoleClientException) { - logger.warn("HTTP tunnel request rejected: {}", e.getMessage()); - sendError(response, e.getStatus().getGuacamoleStatusCode(), - e.getStatus().getHttpStatusCode(), e.getMessage()); - } - else { - logger.error("HTTP tunnel request failed: {}", e.getMessage()); - logger.debug("Internal error in HTTP tunnel.", e); - sendError(response, e.getStatus().getGuacamoleStatusCode(), - e.getStatus().getHttpStatusCode(), "Internal server error."); - } + logger.error("HTTP tunnel request failed: {}", e.getMessage()); + logger.debug("Internal error in HTTP tunnel.", e); + sendError(response, e.getStatus().getGuacamoleStatusCode(), + e.getStatus().getHttpStatusCode(), "Internal server error."); } }