From 391d99d4c1758399d465a9052f5c95951b67d6db Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Thu, 17 Dec 2015 21:16:05 -0800
Subject: [PATCH] GUAC-1442: Do not attempt to remove/retrieve tokens that do
 not exist.

---
 .../net/basic/rest/auth/BasicTokenSessionMap.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
index fcc410985..c92f6a7eb 100644
--- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
+++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/rest/auth/BasicTokenSessionMap.java
@@ -151,6 +151,10 @@ public class BasicTokenSessionMap implements TokenSessionMap {
     @Override
     public GuacamoleSession get(String authToken) {
         
+        // There are no null auth tokens
+        if (authToken == null)
+            return null;
+
         // Update the last access time and return the GuacamoleSession
         GuacamoleSession session = sessionMap.get(authToken);
         if (session != null)
@@ -167,7 +171,14 @@ public class BasicTokenSessionMap implements TokenSessionMap {
 
     @Override
     public GuacamoleSession remove(String authToken) {
+
+        // There are no null auth tokens
+        if (authToken == null)
+            return null;
+
+        // Attempt to retrieve only if non-null
         return sessionMap.remove(authToken);
+
     }
 
     @Override