Skip to content

Commit 3da98f7

Browse files
authored
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
1 parent d25201a commit 3da98f7

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ void testShutdownFlag(final Configuration config, final LoggerContext ctx) throw
3535
Field shutdownCallback = LoggerContext.class.getDeclaredField("shutdownCallback");
3636
Object fieldValue = ReflectionUtil.getFieldValue(shutdownCallback, ctx);
3737
assertFalse(config.isShutdownHookEnabled(), "Shutdown hook is enabled");
38-
assertNull(fieldValue, "Shutdown callback is null");
38+
assertNull(fieldValue, "Shutdown callback");
3939
}
4040
}

src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
33
xmlns="https://logging.apache.org/xml/ns"
44
xsi:schemaLocation="https://logging.apache.org/xml/ns https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
5-
type="added">
5+
type="fixed">
66
<issue id="2614" link="https://github.com/apache/logging-log4j2/issues/2614"/>
77
<description format="asciidoc">
88
Fix shutdownDisable configuration does not take effect

0 commit comments

Comments
 (0)