diff --git a/src/helma/servlet/AbstractServletClient.java b/src/helma/servlet/AbstractServletClient.java index 801ece60..563381c4 100644 --- a/src/helma/servlet/AbstractServletClient.java +++ b/src/helma/servlet/AbstractServletClient.java @@ -30,6 +30,8 @@ public abstract class AbstractServletClient extends HttpServlet { boolean caching; boolean debug; + static final byte HTTP_GET = 0; + static final byte HTTP_POST = 1; public void init (ServletConfig init) throws ServletException { super.init (init); @@ -64,23 +66,23 @@ public abstract class AbstractServletClient extends HttpServlet { public void doGet (HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - execute (request, response); + execute (request, response, HTTP_GET); } public void doPost (HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - execute (request, response); + execute (request, response, HTTP_POST); } - protected void execute (HttpServletRequest request, HttpServletResponse response) { + protected void execute (HttpServletRequest request, HttpServletResponse response, byte method) { String protocol = request.getProtocol (); Cookie[] cookies = request.getCookies(); // get app and path from original request path String pathInfo = request.getPathInfo (); String appID = getAppID (pathInfo); - RequestTrans reqtrans = new RequestTrans (); + RequestTrans reqtrans = new RequestTrans (method); reqtrans.path = getRequestPath (pathInfo); try { diff --git a/src/helma/servlet/AcmeServletClient.java b/src/helma/servlet/AcmeServletClient.java index 3e001f0f..746f58a9 100644 --- a/src/helma/servlet/AcmeServletClient.java +++ b/src/helma/servlet/AcmeServletClient.java @@ -28,6 +28,8 @@ public class AcmeServletClient extends HttpServlet { private boolean caching; private boolean debug; + static final byte HTTP_GET = 0; + static final byte HTTP_POST = 1; public AcmeServletClient (Application app) { this.app = app; @@ -39,27 +41,22 @@ public class AcmeServletClient extends HttpServlet { // do nothing } - public void service (HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - execute (request, response); - } - public void doGet (HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - execute (request, response); + execute (request, response, HTTP_GET); } public void doPost (HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - execute (request, response); + execute (request, response, HTTP_POST); } - - private void execute (HttpServletRequest request, HttpServletResponse response) { + private void execute (HttpServletRequest request, HttpServletResponse response, byte method) { String protocol = request.getProtocol (); Cookie[] cookies = request.getCookies(); try { - RequestTrans reqtrans = new RequestTrans (); + RequestTrans reqtrans = new RequestTrans (method); + // HACK - sessions not fully supported in Acme.Serve // Thats ok, we dont need the session object, just the id. reqtrans.session = request.getRequestedSessionId();