This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 44884913253fa91015662d12724392030bd821ca Author: Mark Thomas <[email protected]> AuthorDate: Mon Mar 29 14:17:22 2021 +0100 Align with 10.0.x, 9.0.x and 8.5.x --- java/org/apache/catalina/core/NamingContextListener.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/java/org/apache/catalina/core/NamingContextListener.java b/java/org/apache/catalina/core/NamingContextListener.java index 8616587..e7e99e5 100644 --- a/java/org/apache/catalina/core/NamingContextListener.java +++ b/java/org/apache/catalina/core/NamingContextListener.java @@ -1120,7 +1120,7 @@ public class NamingContextListener try { envCtx.unbind(name); } catch (NamingException e) { - log.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", name), e); } } @@ -1136,7 +1136,7 @@ public class NamingContextListener try { envCtx.unbind(name); } catch (NamingException e) { - log.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", name), e); } } @@ -1152,7 +1152,7 @@ public class NamingContextListener try { envCtx.unbind(name); } catch (NamingException e) { - log.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", name), e); } } @@ -1169,7 +1169,7 @@ public class NamingContextListener try { envCtx.unbind(name); } catch (NamingException e) { - log.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", name), e); } } @@ -1185,7 +1185,7 @@ public class NamingContextListener try { envCtx.unbind(name); } catch (NamingException e) { - log.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", name), e); } } @@ -1201,7 +1201,7 @@ public class NamingContextListener try { envCtx.unbind(name); } catch (NamingException e) { - log.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", name), e); } ObjectName on = objectNames.get(name); @@ -1224,7 +1224,7 @@ public class NamingContextListener try { envCtx.unbind(name); } catch (NamingException e) { - log.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", name), e); } } @@ -1240,7 +1240,7 @@ public class NamingContextListener try { envCtx.unbind(name); } catch (NamingException e) { - log.error(sm.getString("naming.unbindFailed", e)); + log.error(sm.getString("naming.unbindFailed", name), e); } ResourceLinkFactory.deregisterGlobalResourceAccess(getGlobalNamingContext(), name); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
