Repository: guacamole-client Updated Branches: refs/heads/master c8d825e2f -> 2da179f7f
GUACAMOLE-504: Fix-up style issues. Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/ebd89742 Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/ebd89742 Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/ebd89742 Branch: refs/heads/master Commit: ebd897421d4f00a118c66c25d0f3cd185b727078 Parents: ffc4c7b Author: Nick Couchman <vn...@apache.org> Authored: Thu Feb 8 23:31:06 2018 -0500 Committer: Nick Couchman <vn...@apache.org> Committed: Fri Feb 9 13:17:08 2018 -0500 ---------------------------------------------------------------------- .../apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java | 5 ++--- .../websocket/tomcat/GuacamoleWebSocketTunnelServlet.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ebd89742/guacamole-common/src/main/java/org/apache/guacamole/servlet/GuacamoleHTTPTunnelServlet.java ---------------------------------------------------------------------- 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 8e146ff..4845f90 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 @@ -165,7 +165,6 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet { int guacamoleHttpCode, String message) throws ServletException { - try { // If response not committed, send error code and message @@ -241,14 +240,14 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet { // If read operation, call doRead() with tunnel UUID, ignoring any // characters following the tunnel UUID. - else if(query.startsWith(READ_PREFIX)) + else if (query.startsWith(READ_PREFIX)) doRead(request, response, query.substring( READ_PREFIX_LENGTH, READ_PREFIX_LENGTH + UUID_LENGTH)); // If write operation, call doWrite() with tunnel UUID, ignoring any // characters following the tunnel UUID. - else if(query.startsWith(WRITE_PREFIX)) + else if (query.startsWith(WRITE_PREFIX)) doWrite(request, response, query.substring( WRITE_PREFIX_LENGTH, WRITE_PREFIX_LENGTH + UUID_LENGTH)); http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/ebd89742/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java ---------------------------------------------------------------------- diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java index 280848c..29f6481 100644 --- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java +++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java @@ -69,7 +69,7 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet { Integer webSocketCode) { try { - if(webSocketCode == null) + if (webSocketCode == null) webSocketCode = guac_status.getWebSocketCode(); byte[] message = Integer.toString(guac_status.getGuacamoleStatusCode()).getBytes("UTF-8"); outbound.close(webSocketCode, ByteBuffer.wrap(message));
