This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/main by this push:
new 659941aa87 Add missing change from AbstractManager cleanup
659941aa87 is described below
commit 659941aa876b07fd051a716fc3b19d7702aa73f7
Author: Matt Sicker <[email protected]>
AuthorDate: Mon Nov 13 14:18:15 2023 -0600
Add missing change from AbstractManager cleanup
Signed-off-by: Matt Sicker <[email protected]>
---
.../org/apache/logging/log4j/core/appender/ManagerRegistry.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerRegistry.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerRegistry.java
index 78563da373..e4d0061ea2 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerRegistry.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ManagerRegistry.java
@@ -73,7 +73,7 @@ public class ManagerRegistry {
final String name = manager.getName();
registryLock.lock();
try {
- if (--manager.count <= 0 && managers.remove(name, manager)) {
+ if (--manager.count <= 0 && removeManager(name, manager)) {
final String simpleName = manager.getClass().getSimpleName();
LOGGER.debug("Shutting down {} {}", simpleName, name);
final boolean stopped = manager.releaseSub(timeout, unit);
@@ -85,4 +85,9 @@ public class ManagerRegistry {
registryLock.unlock();
}
}
+
+ boolean removeManager(final String name, final AbstractManager manager) {
+ return managers.remove(name, manager);
+ }
+
}