From 073d60726f84d7572d43b9e79577c3e3aa83b47a Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 19 Jan 2024 12:25:04 +0100 Subject: [PATCH 1/3] Fix typo Signed-off-by: Sven Strickroth --- .../src/main/java/chapters/mdc/UserServletFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java index d7796715aa..c75e468aee 100644 --- a/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java +++ b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java @@ -27,8 +27,8 @@ import org.slf4j.MDC; /** - * A simple servlet filter that puts the username - * found either in the Principal. + * A simple servlet filter that stores the username + * found in the Principal in the MDC. * *

The value is removed from the MDC once the request has been * fully processed. From faca52b31142a5dbe1a6d2480c28d4a539989a8f Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 19 Jan 2024 12:26:14 +0100 Subject: [PATCH 2/3] Small code optimization Signed-off-by: Sven Strickroth --- .../src/main/java/chapters/mdc/UserServletFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java index c75e468aee..55c199cde6 100644 --- a/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java +++ b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java @@ -74,7 +74,7 @@ public void init(FilterConfig arg0) throws ServletException { * @return true id the user can be successfully registered */ private boolean registerUsername(String username) { - if (username != null && username.trim().length() > 0) { + if (username != null && !username.trim().isEmpty()) { MDC.put(USER_KEY, username); return true; } From b20d8e55d59ce5dfd2011ba4fbe1dbb67a956e6e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 19 Jan 2024 12:26:17 +0100 Subject: [PATCH 3/3] Be more specific when the value in the MDC is removed Signed-off-by: Sven Strickroth --- .../logback/classic/helpers/MDCInsertingServletFilter.java | 4 +++- .../src/main/java/chapters/mdc/UserServletFilter.java | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java b/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java index d4fba62160..3567d08d97 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/helpers/MDCInsertingServletFilter.java @@ -32,7 +32,9 @@ * request into the MDC. *

*

- * The values are removed after the request is processed. + * The values are removed after the all following + * filters/servlets have been processed. Note, however, + * the value is not available in an error handler servlet. * * @author Ceki Gülcü */ diff --git a/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java index 55c199cde6..cfb85b1d31 100644 --- a/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java +++ b/logback-examples/src/main/java/chapters/mdc/UserServletFilter.java @@ -30,8 +30,9 @@ * A simple servlet filter that stores the username * found in the Principal in the MDC. * - *

The value is removed from the MDC once the request has been - * fully processed. + *

The value is removed from the MDC once all following + * filters/servlets have been fully processed. Note, however, + * the value is not available in an error handler servlet. * * @author Sébastien Pennec */