61cdbe88 by Ean Schuessler

Use the actual HTTP method if the method

If the "method" field is not set in the model.
1 parent ce3f4f2b
......@@ -18,6 +18,7 @@ import java.util.HashSet;
import java.util.Enumeration;
import java.util.Locale;
import java.util.TimeZone;
import java.util.Iterator;
import javolution.util.FastList;
......@@ -112,13 +113,20 @@ public class DirectControlServlet extends HttpServlet {
Map<String, Object> context = new HashMap<String, Object>();
String authToken = null;
String paramList = "";
for (Iterator<String> k = request.getParameterMap().keySet().iterator(); k.hasNext(); ) {
paramList += " " + k.next();
}
Debug.logInfo("PARAMETERS: " + request.getParameterMap(), module);
// Handle if this is a form post
String contentType = request.getContentType();
if (contentType != null && contentType.indexOf("x-www-form-urlencoded") != -1) {
method = request.getParameter("_method");
Debug.logInfo("Method: " + method, module);
if (method == null) method = "POST";
String httpMethod = request.getMethod();
if (method == null && httpMethod != null) method = httpMethod;
Debug.logInfo("Method: HTTP(" + httpMethod + ") embedded(" + method + ")", module);
if (method == null) method = "GET";
// If this is a backbone PUT/DELETE emulated call then handle it
if ("PUT".equals(method) || "DELETE".equals(method) || "CALL".equals(method) || "POST".equals(method)) {
// if (!"CALL".equals(method)) context.put("_method", method);
......