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

This commit is contained in:
Michael Jumper
2016-04-14 17:47:34 -07:00
parent d398509660
commit 0ba8da2dd2

View File

@@ -53,6 +53,12 @@ public class StreamInterceptingTunnel extends DelegatingGuacamoleTunnel {
*/
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,
* reading and intercepting stream-related instructions as necessary to
@@ -319,7 +325,7 @@ public class StreamInterceptingTunnel extends DelegatingGuacamoleTunnel {
synchronized (stream) {
while (streams.get(indexString) == stream) {
try {
stream.wait();
stream.wait(STREAM_WAIT_TIMEOUT);
}
catch (InterruptedException e) {
// Ignore