diff --git a/src/helma/framework/RequestTrans.java b/src/helma/framework/RequestTrans.java index 8ca1b52e..e8744aa3 100644 --- a/src/helma/framework/RequestTrans.java +++ b/src/helma/framework/RequestTrans.java @@ -28,6 +28,9 @@ import java.util.*; public class RequestTrans implements Externalizable { static final long serialVersionUID = 5398880083482000580L; + public final static byte GET = 0; + public final static byte POST = 1; + // the uri path of the request public String path; @@ -36,9 +39,9 @@ public class RequestTrans implements Externalizable { // the map of form and cookie data private Map values; - + // the request method - 0 for GET, 1 for POST - private byte httpMethod = 0; + private byte httpMethod = GET; // timestamp of client-cached version, if present in request private long ifModifiedSince = -1; @@ -53,12 +56,12 @@ public class RequestTrans implements Externalizable { public transient String action; private transient String httpUsername; private transient String httpPassword; - + /** * Create a new Request transmitter with an empty data map. */ public RequestTrans() { - httpMethod = 0; + this(GET); values = new SystemMap(); } @@ -122,14 +125,14 @@ public class RequestTrans implements Externalizable { * Return true if this object represents a HTTP GET Request. */ public boolean isGet() { - return httpMethod == 0; + return httpMethod == GET; } /** * Return true if this object represents a HTTP GET Request. */ public boolean isPost() { - return httpMethod == 1; + return httpMethod == POST; } /** diff --git a/src/helma/servlet/AbstractServletClient.java b/src/helma/servlet/AbstractServletClient.java index 5d13a8b1..3463bc90 100644 --- a/src/helma/servlet/AbstractServletClient.java +++ b/src/helma/servlet/AbstractServletClient.java @@ -32,8 +32,6 @@ import javax.servlet.http.*; * via RMI. Subclasses are either one servlet per app, or one servlet that handles multiple apps */ public abstract class AbstractServletClient extends HttpServlet { - static final byte HTTP_GET = 0; - static final byte HTTP_POST = 1; // host on which Helma app is running String host = null; @@ -100,7 +98,7 @@ public abstract class AbstractServletClient extends HttpServlet { */ public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - execute(request, response, HTTP_GET); + execute(request, response, RequestTrans.GET); } /** @@ -114,7 +112,7 @@ public abstract class AbstractServletClient extends HttpServlet { */ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { - execute(request, response, HTTP_POST); + execute(request, response, RequestTrans.POST); } protected void execute(HttpServletRequest request, HttpServletResponse response, @@ -153,7 +151,7 @@ public abstract class AbstractServletClient extends HttpServlet { // check for MIME file uploads String contentType = request.getContentType(); - + if ((contentType != null) && (contentType.indexOf("multipart/form-data") == 0)) { // File Upload @@ -193,8 +191,9 @@ public abstract class AbstractServletClient extends HttpServlet { reqtrans.session = nextPart; } else { reqtrans.set(nextKey, nextPart); - } + } } catch (Exception badCookie) { + // ignore } }