This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch 2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/2.x by this push:
new 3da98f7c9d fix ShutdownDisabledTest and LoggerContext_shutdownDisable
changelog (#3581)
3da98f7c9d is described below
commit 3da98f7c9de9bf4abb17e10dad678e05ab658a3a
Author: syd <[email protected]>
AuthorDate: Tue Apr 1 18:01:58 2025 +0800
fix ShutdownDisabledTest and LoggerContext_shutdownDisable changelog (#3581)
* - Modify the LoggerContext_shutdownDisable.xml file to change the entry
type from "added" to "fixed"
- Update the ShutdownDisabledTest.java file to fix the assertion check for
shutdown callback
* - Update the ShutdownDisabledTest.java file to fix the assertion check
for shutdown callback
---
.../test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java | 2 +-
src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
index fd7dbf2607..2e576d226b 100644
---
a/log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
+++
b/log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
@@ -35,6 +35,6 @@ class ShutdownDisabledTest {
Field shutdownCallback =
LoggerContext.class.getDeclaredField("shutdownCallback");
Object fieldValue = ReflectionUtil.getFieldValue(shutdownCallback,
ctx);
assertFalse(config.isShutdownHookEnabled(), "Shutdown hook is
enabled");
- assertNull(fieldValue, "Shutdown callback is null");
+ assertNull(fieldValue, "Shutdown callback");
}
}
diff --git a/src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml
b/src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml
index 2cc90a336b..72a3b7eedc 100644
--- a/src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml
+++ b/src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml
@@ -2,7 +2,7 @@
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="https://logging.apache.org/xml/ns";
xsi:schemaLocation="https://logging.apache.org/xml/ns
https://logging.apache.org/xml/ns/log4j-changelog-0.xsd";
- type="added">
+ type="fixed">
<issue id="2614"
link="https://github.com/apache/logging-log4j2/issues/2614"/>
<description format="asciidoc">
Fix shutdownDisable configuration does not take effect
