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

GUACAMOLE-44: Do not wait forever for streams to be notified.

Browse Source
This commit is contained in:
Michael Jumper
2016-04-14 17:47:34 -07:00
parent d398509660
commit 0ba8da2dd2
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole/src/main/java/org/apache/guacamole/tunnel/StreamInterceptingTunnel.java
View File

@@ -53,6 +53,12 @@ public class StreamInterceptingTunnel extends DelegatingGuacamoleTunnel {
*/ */
private static final Logger logger = LoggerFactory.getLogger(StreamInterceptingTunnel.class); private static final Logger logger = LoggerFactory.getLogger(StreamInterceptingTunnel.class);
/**
* The maximum number of milliseconds to wait for notification that a
* stream has closed before explicitly checking for closure ourselves.
*/
private static final long STREAM_WAIT_TIMEOUT = 1000;
/** /**
* Creates a new StreamInterceptingTunnel which wraps the given tunnel, * Creates a new StreamInterceptingTunnel which wraps the given tunnel,
* reading and intercepting stream-related instructions as necessary to * reading and intercepting stream-related instructions as necessary to
@@ -319,7 +325,7 @@ public class StreamInterceptingTunnel extends DelegatingGuacamoleTunnel {
synchronized (stream) { synchronized (stream) {
while (streams.get(indexString) == stream) { while (streams.get(indexString) == stream) {
try { try {
stream.wait(); stream.wait(STREAM_WAIT_TIMEOUT);
} }
catch (InterruptedException e) { catch (InterruptedException e) {
// Ignore // Ignore