From 10cf47895812945b7cb83f5dd82356db4e0962c4 Mon Sep 17 00:00:00 2001 From: dragonfsky Date: Fri, 31 Jul 2026 11:09:27 +0800 Subject: [PATCH] Issue #15514 - Avoid duplicate lifecycle failure logging --- .../util/component/AbstractLifeCycle.java | 2 -- .../util/component/LifeCycleListenerTest.java | 30 ++++++------------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java index 615e32dae7b2..1e600c9e59cf 100644 --- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java +++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/component/AbstractLifeCycle.java @@ -294,8 +294,6 @@ private void setStopped() private void setFailed(Throwable th) { _state = State.FAILED; - if (LOG.isDebugEnabled()) - LOG.warn("FAILED {}: {}", this, th, th); for (EventListener listener : _eventListeners) { if (listener instanceof Listener) diff --git a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java index e357ebcd2f47..c23afbc81922 100644 --- a/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java +++ b/jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/component/LifeCycleListenerTest.java @@ -13,12 +13,12 @@ package org.eclipse.jetty.util.component; -import org.eclipse.jetty.logging.StacklessLogging; import org.eclipse.jetty.util.NanoTime; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -35,16 +35,10 @@ public void testStart() throws Exception lifecycle.setCause(cause); - try (StacklessLogging stackless = new StacklessLogging(AbstractLifeCycle.class)) - { - lifecycle.start(); - assertTrue(false); - } - catch (Exception e) - { - assertEquals(cause, e); - assertEquals(cause, listener.getCause()); - } + Exception failure = assertThrows(Exception.class, lifecycle::start); + assertSame(cause, failure); + assertTrue(lifecycle.isFailed()); + assertSame(cause, listener.getCause()); lifecycle.setCause(null); lifecycle.start(); @@ -76,16 +70,10 @@ public void testStop() throws Exception lifecycle.start(); lifecycle.setCause(cause); - try (StacklessLogging stackless = new StacklessLogging(AbstractLifeCycle.class)) - { - lifecycle.stop(); - assertTrue(false); - } - catch (Exception e) - { - assertEquals(cause, e); - assertEquals(cause, listener.getCause()); - } + Exception failure = assertThrows(Exception.class, lifecycle::stop); + assertSame(cause, failure); + assertTrue(lifecycle.isFailed()); + assertSame(cause, listener.getCause()); lifecycle.setCause(null);