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

Improved error handling

Browse Source
This commit is contained in:
Michael Jumper
2011-04-08 22:40:25 -07:00
parent c020565397
commit 2778429fba
1 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
guacamole-common/src/main/java/net/sourceforge/guacamole/net/tunnel/GuacamoleTunnelServlet.java
View File

@@ -54,6 +54,8 @@ public abstract class GuacamoleTunnelServlet extends HttpServlet {
if (query == null) if (query == null)
throw new GuacamoleException("No query string provided."); throw new GuacamoleException("No query string provided.");
// If connect operation, call doConnect() and return tunnel UUID
// in response.
if (query.equals("connect")) { if (query.equals("connect")) {
GuacamoleTunnel tunnel = doConnect(request); GuacamoleTunnel tunnel = doConnect(request);
@@ -68,17 +70,48 @@ public abstract class GuacamoleTunnelServlet extends HttpServlet {
} }
// If read operation, call doRead() with tunnel UUID
else if(query.startsWith("read:")) else if(query.startsWith("read:"))
doRead(request, response, query.substring(5)); doRead(request, response, query.substring(5));
// If write operation, call doWrite() with tunnel UUID
else if(query.startsWith("write:")) else if(query.startsWith("write:"))
doWrite(request, response, query.substring(6)); doWrite(request, response, query.substring(6));
// Otherwise, invalid operation
else else
throw new GuacamoleException("Invalid tunnel operation: " + query); throw new GuacamoleException("Invalid tunnel operation: " + query);
} }
// Catch any thrown guacamole exception and attempt to pass within the
// HTTP response.
catch (GuacamoleException e) { catch (GuacamoleException e) {
throw new ServletException(e);
try {
// If response not committed, send error code along with
// message.
if (!response.isCommitted()) {
response.setHeader("X-Guacamole-Error-Message", e.getMessage());
response.sendError(
HttpServletResponse.SC_INTERNAL_SERVER_ERROR,
e.getMessage()
);
}
// If unable to send error code, rethrow as servlet exception
else
throw new ServletException(e);
}
catch (IOException ioe) {
// If unable to send error at all due to I/O problems,
// rethrow as servlet exception
throw new ServletException(ioe);
}
} }
} }
@@ -106,36 +139,27 @@ public abstract class GuacamoleTunnelServlet extends HttpServlet {
Writer out = response.getWriter(); Writer out = response.getWriter();
try { // Query new update from server
GuacamoleClient client = tunnel.getClient();
// Query new update from server // For all messages, until another stream is ready (we send at least one message)
GuacamoleClient client = tunnel.getClient(); char[] message;
while ((message = client.read()) != null) {
// For all messages, until another stream is ready (we send at least one message) // Get message output bytes
char[] message; out.write(message, 0, message.length);
while ((message = client.read()) != null) {
// Get message output bytes
out.write(message, 0, message.length);
out.flush();
response.flushBuffer();
// No more messages another stream can take over
if (instructionStreamLock.hasQueuedThreads())
break;
}
if (message == null) {
session.detachTunnel(tunnel);
throw new GuacamoleException("Disconnected.");
}
}
catch (GuacamoleException e) {
out.write("error:" + e.getMessage() + ";");
out.flush(); out.flush();
response.flushBuffer(); response.flushBuffer();
// No more messages another stream can take over
if (instructionStreamLock.hasQueuedThreads())
break;
}
if (message == null) {
session.detachTunnel(tunnel);
throw new GuacamoleException("Disconnected.");
} }
// End-of-instructions marker // End-of-instructions marker