diff --git a/mina-core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java b/mina-core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java index 353b753e5..ed67553c6 100644 --- a/mina-core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java +++ b/mina-core/src/main/java/org/apache/mina/filter/logging/MdcInjectionFilter.java @@ -176,11 +176,14 @@ protected void filter(IoFilterEvent event) throws Exception { private Map getAndFillContext(final IoSession session) { Map context = getContext(session); - - if (context.isEmpty()) { - fillContext(session, context); + + // make sure that context returned is fully filled and doesn't return partial context + synchronized (context) { + if (context.isEmpty()) { + fillContext(session, context); + } } - + return context; } @@ -190,7 +193,7 @@ private static Map getContext(final IoSession session) { if (context == null) { context = new ConcurrentHashMap<>(); - session.setAttribute(CONTEXT_KEY, context); + session.setAttributeIfAbsent(CONTEXT_KEY, context); } return context;