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/01/02 14:55:27 UTC
[logging-log4j2] branch release-2.x updated (a944af0 -> 35312ef)
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 a944af0 ListAppender explicit generic types
new 67e3874 [LOG4J2-2522] Make MapMessageLookup.lookup usable with MapMessage again
new 43d9f81 [LOG4J2-2522] Added @Test testLookupDefaultMapIsCheckedBeforeMapMessage()
new 35312ef Changelog for LOG4J2-2522
The 3 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:
.../logging/log4j/core/lookup/MapLookup.java | 6 ++--
.../logging/log4j/core/lookup/MapLookupTest.java | 32 +++++++++++++++++++++-
src/changes/changes.xml | 3 ++
3 files changed, 37 insertions(+), 4 deletions(-)
[logging-log4j2] 02/03: [LOG4J2-2522] Added @Test
testLookupDefaultMapIsCheckedBeforeMapMessage()
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 43d9f81b1736f37a0b2cd737b8c9c97956e2c731
Author: lesiak <le...@outlook.com>
AuthorDate: Tue Dec 18 08:38:14 2018 +0100
[LOG4J2-2522] Added @Test testLookupDefaultMapIsCheckedBeforeMapMessage()
---
.../apache/logging/log4j/core/lookup/MapLookupTest.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java
index f82959b..4298d98 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java
@@ -99,6 +99,20 @@ public class MapLookupTest {
}
@Test
+ public void testLookupDefaultMapIsCheckedBeforeMapMessage() {
+ final HashMap<String, String> map = new HashMap<>();
+ map.put("A", "ADefault");
+ final HashMap<String, Object> eventMap = new HashMap<>();
+ eventMap.put("A", "AEvent");
+ final MapMessage message = new MapMessage<>(eventMap);
+ final LogEvent event = Log4jLogEvent.newBuilder()
+ .setMessage(message)
+ .build();
+ final MapLookup lookup = new MapLookup(map);
+ assertEquals("ADefault", lookup.lookup(event, "A"));
+ }
+
+ @Test
public void testNullEvent() {
final HashMap<String, String> map = new HashMap<>();
map.put("A", "B");
[logging-log4j2] 03/03: Changelog for LOG4J2-2522
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 35312ef6ae9486ef57f50614a88823aece5c096a
Author: Carter Kozak <ck...@apache.org>
AuthorDate: Wed Jan 2 09:55:08 2019 -0500
Changelog for LOG4J2-2522
---
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7a9be1b..a02a704 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -160,6 +160,9 @@
<action issue="LOG4J2-2527" dev="ckozak" type="fix">
Prevent ConcurrentModificationException while iterating over ListAppender events.
</action>
+ <action issue="LOG4J2-2522" dev="ckozak" type="fix" due-to="Adam Lesiak">
+ Fix regression using MapMessageLookup.lookup with MapMessages that do not implement StringMapMessage.
+ </action>
</release>
<release version="2.11.1" date="2018-07-22" description="GA Release 2.11.1">
<action issue="LOG4J2-2389" dev="rgoers" type="fix" due-to="Liu Wen">
[logging-log4j2] 01/03: [LOG4J2-2522] Make MapMessageLookup.lookup
usable with MapMessage again
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 67e387481cf49a7cff495fcb145a386e4e5b6671
Author: lesiak <le...@outlook.com>
AuthorDate: Mon Dec 17 16:29:16 2018 +0100
[LOG4J2-2522] Make MapMessageLookup.lookup usable with MapMessage again
---
.../apache/logging/log4j/core/lookup/MapLookup.java | 6 +++---
.../logging/log4j/core/lookup/MapLookupTest.java | 18 +++++++++++++++++-
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java
index 466decb..c00645e 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/lookup/MapLookup.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.message.StringMapMessage;
+import org.apache.logging.log4j.message.MapMessage;
/**
* A map-based lookup.
@@ -118,7 +118,7 @@ public class MapLookup implements StrLookup {
@Override
public String lookup(final LogEvent event, final String key) {
- final boolean isMapMessage = event != null && event.getMessage() instanceof StringMapMessage;
+ final boolean isMapMessage = event != null && event.getMessage() instanceof MapMessage;
if (map == null && !isMapMessage) {
return null;
}
@@ -129,7 +129,7 @@ public class MapLookup implements StrLookup {
}
}
if (isMapMessage) {
- return ((StringMapMessage) event.getMessage()).get(key);
+ return ((MapMessage) event.getMessage()).get(key);
}
return null;
}
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java
index 61d81ec..f82959b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/MapLookupTest.java
@@ -22,6 +22,7 @@ import java.util.HashMap;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.impl.Log4jLogEvent;
+import org.apache.logging.log4j.message.MapMessage;
import org.apache.logging.log4j.message.StringMapMessage;
import org.junit.Test;
@@ -68,7 +69,7 @@ public class MapLookupTest {
}
@Test
- public void testEventMapMessage() {
+ public void testEventStringMapMessage() {
final HashMap<String, String> map = new HashMap<>();
map.put("A", "B");
final HashMap<String, String> eventMap = new HashMap<>();
@@ -83,6 +84,21 @@ public class MapLookupTest {
}
@Test
+ public void testEventMapMessage() {
+ final HashMap<String, String> map = new HashMap<>();
+ map.put("A", "B");
+ final HashMap<String, Object> eventMap = new HashMap<>();
+ eventMap.put("A1", 11);
+ final MapMessage message = new MapMessage<>(eventMap);
+ final LogEvent event = Log4jLogEvent.newBuilder()
+ .setMessage(message)
+ .build();
+ final MapLookup lookup = new MapLookup(map);
+ assertEquals("B", lookup.lookup(event, "A"));
+ assertEquals("11", lookup.lookup(event, "A1"));
+ }
+
+ @Test
public void testNullEvent() {
final HashMap<String, String> map = new HashMap<>();
map.put("A", "B");