Issue #BF-5728: Move parameter parsing logic out of the 2 separate

conditions, and instead do it at the beginning for all 3.

@@ -135,6 +135,16 @@ public class DirectControlServlet extends HttpServlet {
 
 
             // Load context
             // Load context
             Map<String, Object> context = new HashMap<String, Object>();
             Map<String, Object> context = new HashMap<String, Object>();
+
+            // Directly copy request parameters into context.
+            for (Enumeration<String> params = request.getParameterNames(); params.hasMoreElements();) {
+                String param = params.nextElement();
+                Object[] values = request.getParameterValues(param);
+                if (!"sessionId".equals(param) && !"_method".equals(param)) {
+                    context.put(param, values.length == 1 ? values[0] : values);
+                }
+            }
+
             if ("application/json".equals(contentType)) {
             if ("application/json".equals(contentType)) {
                 // Read request body as JSON and insert into the context
                 // Read request body as JSON and insert into the context
                 JSON json = new JSON(request.getReader());
                 JSON json = new JSON(request.getReader());
@@ -143,15 +153,6 @@ public class DirectControlServlet extends HttpServlet {
                     context.put(key, items.get(key));
                     context.put(key, items.get(key));
                 }
                 }
             } else if ("text/csv".equals(contentType)) {
             } else if ("text/csv".equals(contentType)) {
-                // Directly copy request parameters into context.
-                for (Enumeration<String> params = request.getParameterNames(); params.hasMoreElements();) {
-                    String param = params.nextElement();
-                    Object[] values = request.getParameterValues(param);
-                    if (!"sessionId".equals(param) && !"_method".equals(param)) {
-                        context.put(param, values.length == 1 ? values[0] : values);
-                    }
-                }
-
                 Iterable<CSVRecord> records = CSVFormat.EXCEL.parse(request.getReader());
                 Iterable<CSVRecord> records = CSVFormat.EXCEL.parse(request.getReader());
                 List<List<String>> data = new ArrayList<List<String>>();
                 List<List<String>> data = new ArrayList<List<String>>();
                 for (CSVRecord record : records) {
                 for (CSVRecord record : records) {
@@ -175,15 +176,6 @@ public class DirectControlServlet extends HttpServlet {
                             context.put(key, items.get(key));
                             context.put(key, items.get(key));
                         }
                         }
                     }
                     }
-                } else {
-                    // Directly copy request parameters into context.
-                    for (Enumeration<String> params = request.getParameterNames(); params.hasMoreElements();) {
-                        String param = params.nextElement();
-                        Object[] values = request.getParameterValues(param);
-                        if (!"sessionId".equals(param) && !"_method".equals(param)) {
-                            context.put(param, values.length == 1 ? values[0] : values);
-                        }
-                    }
                 }
                 }
             }
             }