From e6a6ebe724fccd372d5484f37d20b2776d46f549 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sat, 25 Jun 2011 23:33:14 -0700
Subject: [PATCH] Use own function, rather than override service().

---
 .../servlet/GuacamoleTunnelServlet.java         | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleTunnelServlet.java b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleTunnelServlet.java
index 67a1ca4fd..55ad9c2ac 100644
--- a/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleTunnelServlet.java
+++ b/guacamole-common/src/main/java/net/sourceforge/guacamole/servlet/GuacamoleTunnelServlet.java
@@ -43,16 +43,25 @@ public abstract class GuacamoleTunnelServlet extends HttpServlet {
 
     @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException {
-        service(request, response);
+        handleTunnelRequest(request, response);
     }
 
     @Override
     protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException {
-        service(request, response);
+        handleTunnelRequest(request, response);
     }
 
-    @Override
-    protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException {
+    /**
+     * Dispatches every HTTP GET and POST request to the appropriate handler
+     * function based on the query string.
+     *
+     * @param request The HttpServletRequest associated with the GET or POST
+     *                request received.
+     * @param response The HttpServletResponse associated with the GET or POST
+     *                 request received.
+     * @throws ServletException If an error occurs while servicing the request.
+     */
+    protected void handleTunnelRequest(HttpServletRequest request, HttpServletResponse response) throws ServletException {
 
         try {