You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ck...@apache.org on 2021/04/30 22:58:48 UTC

[logging-log4j2] branch release-2.x updated: LOG4J2-2965: Fix JUL/AsyncLoggerContext deadlock

This is an automated email from the ASF dual-hosted git repository.

ckozak pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/release-2.x by this push:
     new cb087dc  LOG4J2-2965: Fix JUL/AsyncLoggerContext deadlock
cb087dc is described below

commit cb087dc74c271f5a09195473a7ca63ddac3eb9d1
Author: Carter Kozak <ck...@apache.org>
AuthorDate: Fri Apr 30 18:58:11 2021 -0400

    LOG4J2-2965: Fix JUL/AsyncLoggerContext deadlock
---
 pom.xml                 | 2 +-
 src/changes/changes.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c5f5597..1087492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,7 +193,7 @@
     <springVersion>5.3.5</springVersion>
     <kubernetes-client.version>4.6.1</kubernetes-client.version>
     <flumeVersion>1.9.0</flumeVersion>
-    <disruptorVersion>3.4.2</disruptorVersion>
+    <disruptorVersion>3.4.4</disruptorVersion>
     <conversantDisruptorVersion>1.2.15</conversantDisruptorVersion> <!-- Version 1.2.16 requires Java 9 -->
     <elastic.version>7.6.2</elastic.version>
     <mongodb3.version>3.12.7</mongodb3.version>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 215e821..f2bde26 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -75,6 +75,9 @@
       <action issue="LOG4J2-2940" dev="ckozak" type="fix">
         Slf4j implementations walk the stack at most once rather than twice to determine the caller's class loader.
       </action>
+      <action issue="LOG4J2-2965" dev="ckozak" type="fix">
+        Fixed a deadlock between the AsyncLoggerContextSelector and java.util.logging.LogManager by updating Disruptor to 3.4.4.
+      </action>
       <!-- UPDATES -->
       <action dev="ggregory" type="update">
         - org.eclipse.persistence:javax.persistence ............. 2.1.1 -> 2.2.1