guacamole-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmuehl...@apache.org
Subject [1/2] incubator-guacamole-client git commit: GUACAMOLE-67: Always clean up the connection upon WebSocket error.
Date Sat, 30 Jul 2016 17:52:38 GMT
Repository: incubator-guacamole-client
Updated Branches:
  refs/heads/master 872aac375 -> e656d7218


GUACAMOLE-67: Always clean up the connection upon WebSocket error.


Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/12abb3c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/12abb3c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/12abb3c5

Branch: refs/heads/master
Commit: 12abb3c59cf0383619fc8f0bb162433a181e2b82
Parents: 872aac3
Author: Michael Jumper <mjumper@apache.org>
Authored: Fri Jul 29 15:47:24 2016 -0700
Committer: Michael Jumper <mjumper@apache.org>
Committed: Fri Jul 29 22:39:26 2016 -0700

----------------------------------------------------------------------
 .../guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java       | 1 +
 .../tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java    | 1 +
 .../tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java   | 1 +
 .../tunnel/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java    | 1 +
 4 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/12abb3c5/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
----------------------------------------------------------------------
diff --git a/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
b/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
index e0aa442..e5943eb 100644
--- a/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
+++ b/guacamole-common/src/main/java/org/apache/guacamole/websocket/GuacamoleWebSocketTunnelEndpoint.java
@@ -198,6 +198,7 @@ public abstract class GuacamoleWebSocketTunnelEndpoint extends Endpoint
{
                 }
                 catch (IOException e) {
                     logger.debug("I/O error prevents further reads.", e);
+                    closeConnection(session, GuacamoleStatus.SERVER_ERROR);
                 }
 
             }

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/12abb3c5/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
index 933ff65..8f7e39e 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty8/GuacamoleWebSocketTunnelServlet.java
@@ -185,6 +185,7 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet
{
                         }
                         catch (IOException e) {
                             logger.debug("WebSocket tunnel read failed due to I/O error.",
e);
+                            closeConnection(connection, GuacamoleStatus.SERVER_ERROR);
                         }
 
                     }

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/12abb3c5/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
----------------------------------------------------------------------
diff --git a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
index 89105fc..3224f89 100644
--- a/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
+++ b/guacamole/src/main/java/org/apache/guacamole/tunnel/websocket/jetty9/GuacamoleWebSocketTunnelListener.java
@@ -176,6 +176,7 @@ public abstract class GuacamoleWebSocketTunnelListener implements WebSocketListe
                 }
                 catch (IOException e) {
                     logger.debug("I/O error prevents further reads.", e);
+                    closeConnection(session, GuacamoleStatus.SERVER_ERROR);
                 }
 
             }

http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/12abb3c5/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 1b9098f..4981675 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
@@ -213,6 +213,7 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet
{
                         }
                         catch (IOException e) {
                             logger.debug("I/O error prevents further reads.", e);
+                            closeConnection(outbound, GuacamoleStatus.SERVER_ERROR);
                         }
 
                     }


Mime
View raw message