You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/02/18 16:29:07 UTC
logging-log4j2 git commit: LOG4J2-1280 Logger methods taking Supplier
parameters now correctly handle cases where the supplied value is a Message.
Repository: logging-log4j2
Updated Branches:
refs/heads/master c58d5b151 -> a56f4208f
LOG4J2-1280 Logger methods taking Supplier parameters now correctly handle cases where the supplied value is a Message.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/a56f4208
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/a56f4208
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/a56f4208
Branch: refs/heads/master
Commit: a56f4208faf53c513b5c43407de889245b906eab
Parents: c58d5b1
Author: rpopma <rp...@apache.org>
Authored: Fri Feb 19 00:29:04 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Feb 19 00:29:04 2016 +0900
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/util/LambdaUtil.java | 5 +++--
src/changes/changes.xml | 3 +++
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a56f4208/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
index 53d1799..ae7646e 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/LambdaUtil.java
@@ -32,7 +32,7 @@ public final class LambdaUtil {
/**
* Converts an array of lambda expressions into an array of their evaluation results.
- *
+ *
* @param suppliers an array of lambda expressions or {@code null}
* @return an array containing the results of evaluating the lambda expressions (or {@code null} if the suppliers
* array was {@code null}
@@ -58,7 +58,8 @@ public final class LambdaUtil {
if (supplier == null) {
return null;
}
- return supplier.get();
+ Object result = supplier.get();
+ return result instanceof Message ? ((Message) result).getFormattedMessage() : result;
}
/**
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/a56f4208/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 32cca1d..e579ed4 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -24,6 +24,9 @@
</properties>
<body>
<release version="2.6" date="201Y-MM-DD" description="GA Release 2.6">
+ <action issue="LOG4J2-1280" dev="rpopma" type="fix">
+ Logger methods taking Supplier parameters now correctly handle cases where the supplied value is a Message.
+ </action>
<action issue="LOG4J2-1272" dev="rpopma" type="update">
Improve LoggerConfig's data structure for AppenderControl objects to avoid allocating temporary objects during
traversal for each log event.