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

GUAC-561: Throw timeout exception when socket times out.

Browse Source
This commit is contained in:
Michael Jumper
2014-03-22 15:27:54 -07:00
parent 6d4a83ce33
commit 03dbfa088e
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
guacamole-common/src/main/java/org/glyptodon/guacamole/io/ReaderGuacamoleReader.java
View File

@@ -25,10 +25,12 @@ package org.glyptodon.guacamole.io;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.net.SocketTimeoutException;
import java.util.Deque; import java.util.Deque;
import java.util.LinkedList; import java.util.LinkedList;
import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException; import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.GuacamoleUpstreamTimeoutException;
import org.glyptodon.guacamole.protocol.GuacamoleInstruction; import org.glyptodon.guacamole.protocol.GuacamoleInstruction;
/** /**
@@ -177,6 +179,9 @@ public class ReaderGuacamoleReader implements GuacamoleReader {
} // End read loop } // End read loop
} }
catch (SocketTimeoutException e) {
throw new GuacamoleUpstreamTimeoutException("Connection to guacd timed out.", e);
}
catch (IOException e) { catch (IOException e) {
throw new GuacamoleServerException(e); throw new GuacamoleServerException(e);
} }

5
guacamole-common/src/main/java/org/glyptodon/guacamole/net/InetGuacamoleSocket.java
View File

@@ -36,8 +36,10 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.net.SocketAddress; import java.net.SocketAddress;
import java.net.SocketTimeoutException;
import org.glyptodon.guacamole.GuacamoleException; import org.glyptodon.guacamole.GuacamoleException;
import org.glyptodon.guacamole.GuacamoleServerException; import org.glyptodon.guacamole.GuacamoleServerException;
import org.glyptodon.guacamole.GuacamoleUpstreamTimeoutException;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -110,6 +112,9 @@ public class InetGuacamoleSocket implements GuacamoleSocket {
writer = new WriterGuacamoleWriter(new OutputStreamWriter(sock.getOutputStream(), "UTF-8")); writer = new WriterGuacamoleWriter(new OutputStreamWriter(sock.getOutputStream(), "UTF-8"));
} }
catch (SocketTimeoutException e) {
throw new GuacamoleUpstreamTimeoutException("Connection timed out.", e);
}
catch (IOException e) { catch (IOException e) {
throw new GuacamoleServerException(e); throw new GuacamoleServerException(e);
} }