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

Fix race condition where tunnel is detached before client has chance to retrieve error message in header via second request.

Browse Source
This commit is contained in:
Michael Jumper
2011-07-04 14:24:40 -07:00
parent 423d1a6268
commit 88b186a856
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleTunnelServlet.java
View File

@@ -187,9 +187,16 @@ public abstract class GuacamoleTunnelServlet extends HttpServlet {
Writer out = response.getWriter(); Writer out = response.getWriter();
// Detach tunnel and throw error if EOF (and we haven't sent any
// data yet.
char[] message = reader.read();
if (message == null) {
session.detachTunnel(tunnel);
throw new GuacamoleException("Disconnected.");
}
// For all messages, until another stream is ready (we send at least one message) // For all messages, until another stream is ready (we send at least one message)
char[] message; do {
while ((message = reader.read()) != null) {
// Get message output bytes // Get message output bytes
out.write(message, 0, message.length); out.write(message, 0, message.length);
@@ -200,12 +207,7 @@ public abstract class GuacamoleTunnelServlet extends HttpServlet {
if (tunnel.hasQueuedReaderThreads()) if (tunnel.hasQueuedReaderThreads())
break; break;
} } while ((message = reader.read()) != null);
if (message == null) {
session.detachTunnel(tunnel);
throw new GuacamoleException("Disconnected.");
}
// End-of-instructions marker // End-of-instructions marker
out.write(';'); out.write(';');