Backport part of #2062 to 2.x branch.
#2454
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I also included a fix for If your prefer to split this fix into a separate PR, I can do it. |
vy
requested changes
Apr 11, 2024
log4j-api/src/main/java/org/apache/logging/log4j/util/PropertySource.java
Outdated
Show resolved
Hide resolved
log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
Outdated
Show resolved
Hide resolved
vy
reviewed
Jul 1, 2024
log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
Show resolved
Hide resolved
log4j-api/src/main/java/org/apache/logging/log4j/util/PropertiesUtil.java
Show resolved
Hide resolved
This commit includes fixes for: - Spring 33450 - Spring shutdown fails due to IllegalStateException (#2062) - [LOG4J2-3618] Fix property source comparator and review suggestions from #2454.
ppkarwasz
force-pushed
the
fix/backport_2062
branch
from
1e437b7 to
dd5df4b
Compare
|
I am squashing the PR before a merge. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This backports the part of PR #2062 that concerns spring-projects/spring-boot#33450 to the
2.xbranch.It contains two sets of changes:
PropertiesUtil#removePropertySourceto allow Spring Boot to remove its custom property source, when the SpringEnvironmentbecomes unavailable at shutdown.Note that the second change will not be effective until Spring Boot starts using it, which can happen only after a
2.24.0release of Log4j API.Remark: the part of PR #2062 that concerns #1799 was not backported, since I believe it to be a Spring Boot problem:
o.a.l.l.spi.LoggerContext,LogManager.getContextmultiple times, but cache theLoggerContextit received at startup.Fixes #2453