Merge branch 'BF-2755' of /home/git/repositories/brainfood/ofbiz-directcontrolservlet

@@ -111,14 +111,12 @@ public class DirectControlServlet extends HttpServlet {
 
 
             // Build context
             // Build context
             Map<String, Object> context = new HashMap<String, Object>();
             Map<String, Object> context = new HashMap<String, Object>();
-            String authToken = null;
-
             String paramList = "";
             String paramList = "";
             for (Iterator<String> k = request.getParameterMap().keySet().iterator(); k.hasNext(); ) {
             for (Iterator<String> k = request.getParameterMap().keySet().iterator(); k.hasNext(); ) {
                 paramList += " " + k.next();
                 paramList += " " + k.next();
             }
             }
 
 
-            Debug.logInfo("PARAMETERS: " + request.getParameterMap(), module);
+            Debug.logInfo("PARAMETERS: " + paramList, module);
             // Handle if this is a form post
             // Handle if this is a form post
             String contentType = request.getContentType();
             String contentType = request.getContentType();
             if (contentType != null && contentType.indexOf("x-www-form-urlencoded") != -1) {
             if (contentType != null && contentType.indexOf("x-www-form-urlencoded") != -1) {
@@ -128,25 +126,23 @@ public class DirectControlServlet extends HttpServlet {
                 Debug.logInfo("Method: HTTP(" + httpMethod + ") embedded(" + method + ")", module);
                 Debug.logInfo("Method: HTTP(" + httpMethod + ") embedded(" + method + ")", module);
                 if (method == null) method = "GET";
                 if (method == null) method = "GET";
                 // If this is a backbone PUT/DELETE emulated call then handle it
                 // 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 (request.getParameter("model") != null) {
 //                    if (!"CALL".equals(method)) context.put("_method", method);
 //                    if (!"CALL".equals(method)) context.put("_method", method);
                     JSON json = new JSON(new StringReader(request.getParameter("model")));
                     JSON json = new JSON(new StringReader(request.getParameter("model")));
                     Map<String,Object> items = json.JSONObject();
                     Map<String,Object> items = json.JSONObject();
-                    authToken = (String) items.get("sessionId");
                     for (String key : items.keySet()) {
                     for (String key : items.keySet()) {
                         if (!"sessionId".equals(key) && !"_method".equals(key)) {
                         if (!"sessionId".equals(key) && !"_method".equals(key)) {
                             context.put(key, items.get(key));
                             context.put(key, items.get(key));
-                            Debug.logInfo("parameter '" + key + "'=" + items.get(key), module);
+                            Debug.logInfo(">parameter '" + key + "'=" + items.get(key), module);
                         }
                         }
                     }
                     }
                 } else {
                 } else {
-                    authToken = request.getParameter("sessionId");
                     for (Enumeration<String> params = request.getParameterNames(); params.hasMoreElements();) {
                     for (Enumeration<String> params = request.getParameterNames(); params.hasMoreElements();) {
                         String param = params.nextElement();
                         String param = params.nextElement();
                         Object[] values = request.getParameterValues(param);
                         Object[] values = request.getParameterValues(param);
                         if (!"sessionId".equals(param) && !"_method".equals(param)) {
                         if (!"sessionId".equals(param) && !"_method".equals(param)) {
                             context.put(param, values.length == 1 ? values[0] : values);
                             context.put(param, values.length == 1 ? values[0] : values);
-                            Debug.logInfo("parameter '" + param + "'=" + context.get(param), module);
+                            Debug.logInfo("!parameter '" + param + "'=" + context.get(param), module);
                         }
                         }
                     }
                     }
                 }
                 }
@@ -177,6 +173,7 @@ public class DirectControlServlet extends HttpServlet {
 
 
             // If the sessionId parameter is set, attempt to look up the corresponding
             // If the sessionId parameter is set, attempt to look up the corresponding
             // UserLogin and apply it to the service context
             // UserLogin and apply it to the service context
+            String authToken = request.getParameter("sessionId");
             if (authToken != null) {
             if (authToken != null) {
                 GenericValue authTokenEntity = EntityUtil.getFirst(
                 GenericValue authTokenEntity = EntityUtil.getFirst(
                     delegator.findList("Visit", 
                     delegator.findList("Visit", 
@@ -198,6 +195,8 @@ public class DirectControlServlet extends HttpServlet {
                 }
                 }
             }
             }
 
 
+            Debug.logInfo("USERLOGIN " + context.get("userLogin") + " AUTHTOKEN " + authToken, module);
+
             // some needed info for when running the service
             // some needed info for when running the service
             Locale locale = UtilHttp.getLocale(request);
             Locale locale = UtilHttp.getLocale(request);
             TimeZone timeZone = UtilHttp.getTimeZone(request);
             TimeZone timeZone = UtilHttp.getTimeZone(request);