camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [3/8] camel git commit: CamelLogger should only call log with marker if marker is not null
Date Sat, 30 Jan 2016 16:06:27 GMT
CamelLogger should only call log with marker if marker is not null


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d03d2674
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d03d2674
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d03d2674

Branch: refs/heads/master
Commit: d03d2674af3b7f46134673fde5e53b5e4e8256f3
Parents: 25540c2
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Sat Jan 30 13:11:24 2016 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Sat Jan 30 17:06:14 2016 +0100

----------------------------------------------------------------------
 camel-core/src/main/java/org/apache/camel/util/CamelLogger.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d03d2674/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java b/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
index 602e062..a2405e9 100644
--- a/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
+++ b/camel-core/src/main/java/org/apache/camel/util/CamelLogger.java
@@ -171,6 +171,7 @@ 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
@@ -218,6 +219,7 @@ public class CamelLogger {
     public static void log(Logger log, LoggingLevel level, Marker marker, String message,
Throwable th) {
         if (marker == null) {
             log(log, level, message, th);
+            return;
         }
 
         // marker must be provided


Mime
View raw message