Issue #BF-5730: Pre-parse the METHOD match into a sub-map, so that the

runtime does not need to do string concatenation in the hot-path.

@@ -71,7 +71,7 @@ import net.sf.json.processors.JsonValueProcessor;
 
 
 public class DirectControlServlet extends HttpServlet {
 public class DirectControlServlet extends HttpServlet {
     public static final String module = DirectControlServlet.class.getName();
     public static final String module = DirectControlServlet.class.getName();
-    public static final Map<String, String> serviceURLMappings = new HashMap<String, String>();
+    public static final Map<String, Map<String, String>> serviceURLMappings = new HashMap<String, Map<String, String>>();
     private String sessionTokenName = "_AUTHTOKEN";
     private String sessionTokenName = "_AUTHTOKEN";
     private String checkSessionService;
     private String checkSessionService;
 
 
@@ -96,7 +96,19 @@ public class DirectControlServlet extends HttpServlet {
                             continue;
                             continue;
                         }
                         }
                         String[] confItem = line.split("=");
                         String[] confItem = line.split("=");
-                        serviceURLMappings.put(confItem[0], confItem[1]);
+                        String[] pathMethodParts = confItem[0].split("#");
+                        String path = pathMethodParts[0], method;
+                        if (pathMethodParts.length == 1) {
+                            method = "GET";
+                        } else {
+                            method = pathMethodParts[1];
+                        }
+                        Map<String, String> methodServiceMap = serviceURLMappings.get(path);
+                        if (methodServiceMap == null) {
+                            methodServiceMap = new HashMap<String, String>();
+                            serviceURLMappings.put(path, methodServiceMap);
+                        }
+                        methodServiceMap.put(method, confItem[1]);
                     }
                     }
             } catch (IOException ex) {
             } catch (IOException ex) {
                 Debug.logInfo("Could not read mapping file " + mappingFile, module);
                 Debug.logInfo("Could not read mapping file " + mappingFile, module);
@@ -187,10 +199,19 @@ public class DirectControlServlet extends HttpServlet {
 
 
             // If there is a mapping for this pathInfo, run the corresponding service
             // If there is a mapping for this pathInfo, run the corresponding service
             // otherwise, return an error
             // otherwise, return an error
-            String serviceName = serviceURLMappings.get(pathInfo + "#" + method);
-            Debug.logInfo("Service name " + serviceName, module);
-            if (serviceName == null) {
-                serviceName = serviceURLMappings.get(pathInfo);
+            Map<String, String> methodServiceMapping = serviceURLMappings.get(pathInfo);
+            if (methodServiceMapping == null) {
+                response.setStatus(404);
+
+                Debug.logInfo("No mapping found for " + pathInfo, module);
+
+                PrintWriter writer = response.getWriter();
+                writer.println("No mapping found for URL \"" + pathInfo + "\"");
+                writer.flush();
+                writer.close();
+                return;
+            }
+            String serviceName = methodServiceMapping.get(method);
             if (serviceName == null) {
             if (serviceName == null) {
                 response.setStatus(404);
                 response.setStatus(404);
 
 
@@ -202,7 +223,7 @@ public class DirectControlServlet extends HttpServlet {
                 writer.close();
                 writer.close();
                 return;
                 return;
             }
             }
-            }
+            Debug.logInfo("Service name " + serviceName, module);
 
 
             // Check if there is an output handler
             // Check if there is an output handler
             String outputHandler = "JSON";
             String outputHandler = "JSON";