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

GUAC-1427: Migrate HTTP tunnel storage to GuacamoleHTTPTunnelMap.

Browse Source
This commit is contained in:
Michael Jumper
2015-12-10 17:53:09 -08:00
parent 5b780fc8cf
commit e1a256b1c1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole-common/src/main/java/org/glyptodon/guacamole/servlet/GuacamoleHTTPTunnelServlet.java
View File

@@ -28,8 +28,6 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.Reader; import java.io.Reader;
import java.io.Writer; import java.io.Writer;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import javax.servlet.ServletException; import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@@ -62,8 +60,7 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
/** /**
* Map of absolutely all active tunnels using HTTP, indexed by tunnel UUID. * Map of absolutely all active tunnels using HTTP, indexed by tunnel UUID.
*/ */
private final ConcurrentMap<String, GuacamoleTunnel> tunnels = private final GuacamoleHTTPTunnelMap tunnels = new GuacamoleHTTPTunnelMap();
new ConcurrentHashMap<String, GuacamoleTunnel>();
/** /**
* The prefix of the query string which denotes a tunnel read operation. * The prefix of the query string which denotes a tunnel read operation.
@@ -512,6 +509,11 @@ public abstract class GuacamoleHTTPTunnelServlet extends HttpServlet {
} }
@Override
public void destroy() {
tunnels.shutdown();
}
} }
/** /**