[camel] branch master updated: camel-core - Optimize log EIP

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
     new 55c2c38  camel-core - Optimize log EIP
55c2c38 is described below

commit 55c2c387d3219cf19b9d96d667dad81e9e9255f6
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Oct 21 13:54:44 2020 +0200

    camel-core - Optimize log EIP
---
 .../main/java/org/apache/camel/spi/CamelLogger.java    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/CamelLogger.java 
b/core/camel-api/src/main/java/org/apache/camel/spi/CamelLogger.java
index 7e0c9b0..c6c28aa 100644
--- a/core/camel-api/src/main/java/org/apache/camel/spi/CamelLogger.java
+++ b/core/camel-api/src/main/java/org/apache/camel/spi/CamelLogger.java
@@ -83,7 +83,11 @@ public class CamelLogger {
      */
     public void log(String message) {
         if (shouldLog(log, level)) {
-            log(log, level, marker, message);
+            if (marker != null) {
+                log(log, level, marker, message);
+            } else {
+                log(log, level, message);
+            }
         }
     }
 
@@ -93,7 +97,11 @@ public class CamelLogger {
      * @param message the message to log
      */
     public void doLog(String message) {
-        log(log, level, marker, message);
+        if (marker != null) {
+            log(log, level, marker, message);
+        } else {
+            log(log, level, message);
+        }
     }
 
     public void log(String message, Throwable exception, LoggingLevel 
loggingLevel) {
@@ -168,12 +176,6 @@ public class CamelLogger {
     }
 
     public static void log(Logger log, LoggingLevel level, Marker marker, 
String message) {
-        if (marker == null) {
-            log(log, level, message);
-            return;
-        }
-
-        // marker must be provided
         switch (level) {
             case DEBUG:
                 log.debug(marker, message);