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 2019/12/23 22:16:33 UTC
[logging-log4j2] branch release-2.x updated (d78578b -> f01862e)
This is an automated email from the ASF dual-hosted git repository.
ckozak pushed a change to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git.
from d78578b Fix errors in the download page
new 932d35c LOG4J2-2415 - Lock contention in classloader because of missing org.slf4j.ext.EventData (#324)
new f01862e LOG4J2-2415 changelog
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/java/org/apache/logging/slf4j/Log4jLogger.java | 9 ++++-----
src/changes/changes.xml | 5 +++++
2 files changed, 9 insertions(+), 5 deletions(-)
[logging-log4j2] 01/02: LOG4J2-2415 - Lock contention in
classloader because of missing org.slf4j.ext.EventData (#324)
Posted by ck...@apache.org.
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
commit 932d35c94e40b7fd8c36130ab8e3c2c4c93e3e22
Author: Turbanov Andrey <tu...@gmail.com>
AuthorDate: Tue Dec 24 01:11:34 2019 +0300
LOG4J2-2415 - Lock contention in classloader because of missing org.slf4j.ext.EventData (#324)
---
.../src/main/java/org/apache/logging/slf4j/Log4jLogger.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java
index ec4decb..1fa8080 100644
--- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java
+++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jLogger.java
@@ -42,16 +42,16 @@ public class Log4jLogger implements LocationAwareLogger, Serializable {
private static final long serialVersionUID = 7869000638091304316L;
private static final Marker EVENT_MARKER = MarkerFactory.getMarker("EVENT");
+ private static final EventDataConverter CONVERTER = createConverter();
+
private final boolean eventLogger;
private transient ExtendedLogger logger;
private final String name;
- private transient EventDataConverter converter;
public Log4jLogger(final ExtendedLogger logger, final String name) {
this.logger = logger;
this.eventLogger = "EventLogger".equals(name);
this.name = name;
- this.converter = createConverter();
}
@Override
@@ -363,8 +363,8 @@ public class Log4jLogger implements LocationAwareLogger, Serializable {
return;
}
final Message msg;
- if (eventLogger && marker != null && marker.contains(EVENT_MARKER) && converter != null) {
- msg = converter.convertEvent(message, params, throwable);
+ if (CONVERTER != null && eventLogger && marker != null && marker.contains(EVENT_MARKER)) {
+ msg = CONVERTER.convertEvent(message, params, throwable);
} else if (params == null) {
msg = new SimpleMessage(message);
} else {
@@ -400,7 +400,6 @@ public class Log4jLogger implements LocationAwareLogger, Serializable {
// always perform the default de-serialization first
aInputStream.defaultReadObject();
logger = LogManager.getContext().getLogger(name);
- converter = createConverter();
}
/**
[logging-log4j2] 02/02: LOG4J2-2415 changelog
Posted by ck...@apache.org.
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
commit f01862e85de9af65f9665fb0d258200819e746c9
Author: Carter Kozak <ck...@apache.org>
AuthorDate: Mon Dec 23 17:15:39 2019 -0500
LOG4J2-2415 changelog
---
src/changes/changes.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 2c701e2..c9b207c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -29,6 +29,11 @@
- "update" - Change
- "remove" - Removed
-->
+ <release version="2.13.1" date="2019-MM-DD" description="GA Release 2.13.1">
+ <action issue="LOG4J2-2415" dev="ckozak" type="fix" due-to="Andrey Turbanov">
+ Fix lock contention in the classloader using new versions of slf4j without EventData on slf4j logger creation.
+ </action>
+ </release>
<release version="2.13.0" date="2019-12-11" description="GA Release 2.13.0">
<action issue="LOG4J2-2058" dev="rgoers" type="fix">
Prevent recursive calls to java.util.LogManager.getLogger().