0001837: If the engine isn't found, the logging context should be '?'…

…, not the previously handled symmetric engine name for that thread
JumpMind · Jul 28, 2014 · acc3a67 · acc3a67
1 parent 38e3af6
commit acc3a67
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricServlet.java b/symmetric-server/src/main/java/org/jumpmind/symmetric/web/SymmetricServlet.java
@@ -65,7 +65,8 @@ public class SymmetricServlet extends HttpServlet {
     @Override
     protected void service(HttpServletRequest req, HttpServletResponse res)
             throws ServletException, IOException {
-        ServerSymmetricEngine engine = findEngine(req);
+        ServerSymmetricEngine engine = findEngine(req);
+        MDC.put("engineName", engine != null ? engine.getEngineName() : "?");
         if (engine == null) {
             boolean nodesBeingCreated = ServletUtils.getSymmetricEngineHolder(getServletContext())
                     .areEnginesStarting();
@@ -85,7 +86,6 @@ protected void service(HttpServletRequest req, HttpServletResponse res)
         } else if (engine.isStarted()) {
             IUriHandler handler = findMatchingHandler(engine, req);
             if (handler != null) {
-                MDC.put("engineName", engine.getEngineName());
                 List<IInterceptor> interceptors = handler.getInterceptors();
                 try {
                     if (interceptors != null) {