From 11b8e3673ac3f5d1c1bfb735efd254a5c1d9aa6a Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Fri, 21 Mar 2014 19:35:04 -0700
Subject: [PATCH] GUAC-558: Send proper error when unable to connect due to
 lack of context.

---
 .../guacamole/net/basic/AuthenticatingHttpServlet.java       | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java
index 262983670..f780449e1 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/AuthenticatingHttpServlet.java
@@ -32,8 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import org.glyptodon.guacamole.GuacamoleClientException;
 import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.GuacamoleResourceNotFoundException;
-import org.glyptodon.guacamole.GuacamoleSecurityException;
+import org.glyptodon.guacamole.GuacamoleUnauthorizedException;
 import org.glyptodon.guacamole.net.auth.AuthenticationProvider;
 import org.glyptodon.guacamole.net.auth.Credentials;
 import org.glyptodon.guacamole.net.auth.UserContext;
@@ -331,7 +330,7 @@ public abstract class AuthenticatingHttpServlet extends HttpServlet {
 
             // If no context, no authorizaton present
             if (context == null)
-                throw new GuacamoleSecurityException("Not authenticated");
+                throw new GuacamoleUnauthorizedException("Not authenticated");
 
             // Allow servlet to run now that authentication has been validated
             authenticatedService(context, request, response);