safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 21:51:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

#518: Close connection on end-of-stream.

Browse Source
This commit is contained in:
Michael Jumper
2014-02-03 11:54:04 -08:00
parent f57d2c167e
commit 76fce28d01
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/jetty/GuacamoleWebSocketTunnelServlet.java
View File

@@ -101,6 +101,8 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
try { try {
try { try {
// Attempt to read
while ((readMessage = reader.read()) != null) { while ((readMessage = reader.read()) != null) {
// Buffer message // Buffer message
@@ -113,6 +115,10 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
} }
} }
// No more data
connection.close(1001, null); // Shutdown
} }
// Catch any thrown guacamole exception and attempt // Catch any thrown guacamole exception and attempt

7
guacamole/src/main/java/org/glyptodon/guacamole/net/basic/websocket/tomcat/GuacamoleWebSocketTunnelServlet.java
View File

@@ -111,8 +111,9 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
try { try {
// Attempt to read
try { try {
// Attempt to read
while ((readMessage = reader.read()) != null) { while ((readMessage = reader.read()) != null) {
// Buffer message // Buffer message
@@ -125,6 +126,10 @@ public abstract class GuacamoleWebSocketTunnelServlet extends WebSocketServlet {
} }
} }
// No more data
outbound.close(Constants.STATUS_SHUTDOWN, null);
} }
// Catch any thrown guacamole exception and attempt // Catch any thrown guacamole exception and attempt