Skip to content

fix ShutdownDisabledTest and LoggerContext_shutdownDisable changelog #3581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 1, 2025
Merged

fix ShutdownDisabledTest and LoggerContext_shutdownDisable changelog #3581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f31554
- Modify the LoggerContext_shutdownDisable.xml file to change the ent…
Pluto-syd Mar 30, 2025
d5bf260
- Update the ShutdownDisabledTest.java file to fix the assertion chec…
Pluto-syd Apr 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion log4j-core-test/src/test/java/org/apache/logging/log4j/core/ShutdownDisabledTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ void testShutdownFlag(final Configuration config, final LoggerContext ctx) throw
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");
}
}
2 changes: 1 addition & 1 deletion src/changelog/.2.x.x/3508_LoggerContext_shutdownDisable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down