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/19 16:32:27 UTC

logging-log4j2 git commit: LOG4J2-1280 fix issue where supplied value is a Message

Repository: logging-log4j2
Updated Branches:
  refs/heads/master 7c9542dcc -> 25a780e95


LOG4J2-1280 fix issue where 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/25a780e9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/25a780e9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/25a780e9

Branch: refs/heads/master
Commit: 25a780e957f7815c67bad148acc5b9b53e674e59
Parents: 7c9542d
Author: rpopma <rp...@apache.org>
Authored: Sat Feb 20 00:32:23 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sat Feb 20 00:32:23 2016 +0900

----------------------------------------------------------------------
 .../org/apache/logging/log4j/spi/AbstractLogger.java     |  4 ++--
 .../java/org/apache/logging/log4j/util/LambdaUtil.java   | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/25a780e9/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
index 03b9323..3d3f57d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
@@ -1115,8 +1115,8 @@ public abstract class AbstractLogger implements ExtendedLogger, Serializable {
 
     protected void logMessage(final String fqcn, final Level level, final Marker marker, final Supplier<?> msgSupplier,
             final Throwable t) {
-        final Object message = LambdaUtil.get(msgSupplier);
-        logMessage(fqcn, level, marker, messageFactory.newMessage(message), t);
+        final Message message = LambdaUtil.getMessage(msgSupplier, messageFactory);
+        logMessage(fqcn, level, marker, message, t);
     }
 
     protected void logMessage(final String fqcn, final Level level, final Marker marker, final String message,

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/25a780e9/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 ae7646e..f7c56b3 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
@@ -18,6 +18,7 @@
 package org.apache.logging.log4j.util;
 
 import org.apache.logging.log4j.message.Message;
+import org.apache.logging.log4j.message.MessageFactory;
 
 
 /**
@@ -58,7 +59,7 @@ public final class LambdaUtil {
         if (supplier == null) {
             return null;
         }
-        Object result = supplier.get();
+        final Object result = supplier.get();
         return result instanceof Message ? ((Message) result).getFormattedMessage() : result;
     }
 
@@ -74,4 +75,12 @@ public final class LambdaUtil {
         }
         return supplier.get();
     }
+
+    public static Message getMessage(Supplier<?> supplier, MessageFactory messageFactory) {
+        if (supplier == null) {
+            return null;
+        }
+        final Object result = supplier.get();
+        return result instanceof Message ? (Message) result : messageFactory.newMessage(result);
+    }
 }