On Mon, Aug 18, 2025 at 9:03 PM <schu...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> schultz pushed a commit to branch main
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/main by this push:
> new ed103d5a37 Simplify
> ed103d5a37 is described below
>
> commit ed103d5a37c78b295ea59083612f4237c24e28bf
> Author: Christopher Schultz <ch...@christopherschultz.net>
> AuthorDate: Mon Aug 18 15:03:17 2025 -0400
>
> Simplify
I'm not convinced a couple of them are any better, but ok ...
Rémy
> ---
> java/org/apache/catalina/core/AprLifecycleListener.java | 5 ++---
> .../apache/catalina/core/ThreadLocalLeakPreventionListener.java | 6 ++----
> java/org/apache/catalina/util/LifecycleBase.java | 8
> +++-----
> .../org/apache/catalina/webresources/AbstractFileResourceSet.java | 5 ++---
> 4 files changed, 9 insertions(+), 15 deletions(-)
>
> diff --git a/java/org/apache/catalina/core/AprLifecycleListener.java
> b/java/org/apache/catalina/core/AprLifecycleListener.java
> index 1d6af1aca5..625217779f 100644
> --- a/java/org/apache/catalina/core/AprLifecycleListener.java
> +++ b/java/org/apache/catalina/core/AprLifecycleListener.java
> @@ -156,10 +156,9 @@ public class AprLifecycleListener implements
> LifecycleListener {
> }
> // Failure to initialize FIPS mode is fatal
> if (!(null == FIPSMode || "off".equalsIgnoreCase(FIPSMode))
> && !isFIPSModeActive()) {
> - String errorMessage =
> sm.getString("aprListener.initializeFIPSFailed");
> - Error e = new Error(errorMessage);
> + Error e = new
> Error(sm.getString("aprListener.initializeFIPSFailed"));
> // Log here, because thrown error might be not logged
> - log.fatal(errorMessage, e);
> + log.fatal(e.getMessage(), e);
> throw e;
> }
> }
> diff --git
> a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
> b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
> index 018440be69..92e5083921 100644
> --- a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
> +++ b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
> @@ -73,8 +73,7 @@ public class ThreadLocalLeakPreventionListener extends
> FrameworkListener {
> stopIdleThreads((Context) lifecycle);
> }
> } catch (Exception e) {
> - String msg =
> sm.getString("threadLocalLeakPreventionListener.lifecycleEvent.error", event);
> - log.error(msg, e);
> +
> log.error(sm.getString("threadLocalLeakPreventionListener.lifecycleEvent.error",
> event), e);
> }
> }
>
> @@ -83,8 +82,7 @@ public class ThreadLocalLeakPreventionListener extends
> FrameworkListener {
> try {
> super.containerEvent(event);
> } catch (Exception e) {
> - String msg =
> sm.getString("threadLocalLeakPreventionListener.containerEvent.error", event);
> - log.error(msg, e);
> +
> log.error(sm.getString("threadLocalLeakPreventionListener.containerEvent.error",
> event), e);
> }
>
> }
> diff --git a/java/org/apache/catalina/util/LifecycleBase.java
> b/java/org/apache/catalina/util/LifecycleBase.java
> index 521ec1a86b..b9ecf70da3 100644
> --- a/java/org/apache/catalina/util/LifecycleBase.java
> +++ b/java/org/apache/catalina/util/LifecycleBase.java
> @@ -393,22 +393,20 @@ public abstract class LifecycleBase implements
> Lifecycle {
>
>
> private void invalidTransition(String type) throws LifecycleException {
> - String msg = sm.getString("lifecycleBase.invalidTransition", type,
> toString(), state);
> - throw new LifecycleException(msg);
> + throw new
> LifecycleException(sm.getString("lifecycleBase.invalidTransition", type,
> toString(), state));
> }
>
>
> private void handleSubClassException(Throwable t, String key, Object...
> args) throws LifecycleException {
> setStateInternal(LifecycleState.FAILED, null, false);
> ExceptionUtils.handleThrowable(t);
> - String msg = sm.getString(key, args);
> if (getThrowOnFailure()) {
> if (!(t instanceof LifecycleException)) {
> - t = new LifecycleException(msg, t);
> + t = new LifecycleException(sm.getString(key, args), t);
> }
> throw (LifecycleException) t;
> } else {
> - log.error(msg, t);
> + log.error(sm.getString(key, args), t);
> }
> }
> }
> diff --git
> a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
> b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
> index 3edfb5551b..7f5955d05c 100644
> --- a/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
> +++ b/java/org/apache/catalina/webresources/AbstractFileResourceSet.java
> @@ -164,12 +164,11 @@ public abstract class AbstractFileResourceSet extends
> AbstractResourceSet {
>
>
> protected void logIgnoredSymlink(String contextPath, String absPath,
> String canPath) {
> - String msg =
> sm.getString("abstractFileResourceSet.canonicalfileCheckFailed", contextPath,
> absPath, canPath);
> // Log issues with configuration files at a higher level
> if (absPath.startsWith("/META-INF/") ||
> absPath.startsWith("/WEB-INF/")) {
> - log.error(msg);
> +
> log.error(sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
> contextPath, absPath, canPath));
> } else {
> - log.warn(msg);
> +
> log.warn(sm.getString("abstractFileResourceSet.canonicalfileCheckFailed",
> contextPath, absPath, canPath));
> }
> }
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
