You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2018/07/22 17:22:28 UTC
[1/2] logging-log4j2 git commit: LOG4J2-2389 - ThrowableProxy was
saving and retrieving cache entries using different keys.
Repository: logging-log4j2
Updated Branches:
refs/heads/release-2.x ab548ce56 -> 27205c8a1
LOG4J2-2389 - ThrowableProxy was saving and retrieving cache entries using different keys.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d310dd49
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d310dd49
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d310dd49
Branch: refs/heads/release-2.x
Commit: d310dd49002d394967a6f6d597bd891a5d6c4d3b
Parents: ab548ce
Author: Ralph Goers <rg...@apache.org>
Authored: Sun Jul 22 10:04:07 2018 -0700
Committer: Ralph Goers <rg...@apache.org>
Committed: Sun Jul 22 10:04:07 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/impl/ThrowableProxy.java | 2 +-
src/changes/changes.xml | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d310dd49/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
index fe557ad..111ff71 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java
@@ -738,7 +738,7 @@ public class ThrowableProxy implements Serializable {
final CacheEntry entry = this.toCacheEntry(stackTraceElement,
this.loadClass(lastLoader, className), false);
extClassInfo = entry.element;
- map.put(stackTraceElement.toString(), entry);
+ map.put(className, entry);
if (entry.loader != null) {
lastLoader = entry.loader;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d310dd49/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5505bb7..fe791fa 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -31,6 +31,9 @@
- "remove" - Removed
-->
<release version="2.11.1" date="2018-MM-DD" description="GA Release 2.11.1">
+ <action issue="LOG4J2-2389" dev="rgoers" type="fix" due-to="Liu Wen">
+ ThrowableProxy was saving and retrieving cache entries using different keys.
+ </action>
<action issue="LOG4J2-2316" dev="rgoers" type="fix">
If root LoggerConfig does not have a Level return ERROR.
</action>
[2/2] logging-log4j2 git commit: Update the SLF4J adapter
documentation
Posted by rg...@apache.org.
Update the SLF4J adapter documentation
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/27205c8a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/27205c8a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/27205c8a
Branch: refs/heads/release-2.x
Commit: 27205c8a1e7fcf0b59fa3d5f615eccfbf4102ac0
Parents: d310dd4
Author: Ralph Goers <rg...@apache.org>
Authored: Sun Jul 22 10:22:20 2018 -0700
Committer: Ralph Goers <rg...@apache.org>
Committed: Sun Jul 22 10:22:20 2018 -0700
----------------------------------------------------------------------
log4j-slf4j-impl/src/site/markdown/index.md | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/27205c8a/log4j-slf4j-impl/src/site/markdown/index.md
----------------------------------------------------------------------
diff --git a/log4j-slf4j-impl/src/site/markdown/index.md b/log4j-slf4j-impl/src/site/markdown/index.md
index 6e3f3f6..2eaea2c 100644
--- a/log4j-slf4j-impl/src/site/markdown/index.md
+++ b/log4j-slf4j-impl/src/site/markdown/index.md
@@ -21,6 +21,12 @@
The Log4j 2 SLF4J Binding allows applications coded to the SLF4J API to use
Log4j 2 as the implementation.
+Due to a break in compatibility in the SLF4J binding, as of release 2.11.1 two SLF4J to Log4j Adapters are provided.
+1. log4j-slf4j-impl should be used with SLF4J 1.7.x releases or older.
+1. log4j-slf4j18-impl should be used with SLF4J 1.8.x releases or newer.
+
+Applications that take advantage of the Java Module System should use SLF4J 1.8.x and log4j-slf4j18-impl.
+
## Requirements
The Log4j 2 SLF4J Binding has a dependency on the Log4j 2 API as well as the SLF4J API.