Index: src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java
===================================================================
--- src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java	(revision 1575505)
+++ src/main/java/org/apache/logging/log4j/spi/AbstractLogger.java	(working copy)
@@ -29,6 +29,9 @@
 import org.apache.logging.log4j.message.StringFormattedMessage;
 import org.apache.logging.log4j.status.StatusLogger;
 
+import static org.apache.logging.log4j.spi.AbstractLogger.Enabled.*;
+import static org.apache.logging.log4j.spi.AbstractLogger.MsgBuilder.*;
+
 /**
  * Base implementation of a Logger. It is highly recommended that any Logger implementation extend this class.
  */
@@ -77,6 +80,90 @@
 
     private static final String CATCHING = "catching";
 
+    public static enum Enabled {
+        ifMessageThrowable {
+            public boolean isEnabled(AbstractLogger logger, Level level, Marker marker, Message msg, String strMessage,
+                    Object objMessage, Throwable t, Object... params) {
+                return logger.isEnabled(level, marker, msg, t);
+            }
+        },
+        ifObjectThrowable {
+            public boolean isEnabled(AbstractLogger logger, Level level, Marker marker, Message msg, String strMessage,
+                    Object objMessage, Throwable t, Object... params) {
+                return logger.isEnabled(level, marker, objMessage, t);
+            }
+        },
+        ifString {
+            public boolean isEnabled(AbstractLogger logger, Level level, Marker marker, Message msg, String strMessage,
+                    Object objMessage, Throwable t, Object... params) {
+                return logger.isEnabled(level, marker, strMessage);
+            }
+        },
+        ifStringVarargs {
+            public boolean isEnabled(AbstractLogger logger, Level level, Marker marker, Message msg, String strMessage,
+                    Object objMessage, Throwable t, Object... params) {
+                return logger.isEnabled(level, marker, strMessage, params);
+            }
+        },
+        ifStringThrowable {
+            public boolean isEnabled(AbstractLogger logger, Level level, Marker marker, Message msg, String strMessage,
+                    Object objMessage, Throwable t, Object... params) {
+                return logger.isEnabled(level, marker, strMessage, t);
+            }
+        };
+        public abstract boolean isEnabled(AbstractLogger logger, Level level, Marker marker, Message msg,
+                String strMessage, Object objMessage, Throwable t, Object... params);
+    }
+
+    public static enum MsgBuilder {
+        fromString {
+            public Message build(MessageFactory factory, Message msg, Object objMessage, String strMessage,
+                    Object... params) {
+                return factory.newMessage(strMessage);
+            }
+
+            public Throwable throwable(Message msg, Throwable t) {
+                return t;
+            }
+        },
+        fromStringVarargs {
+            public Message build(MessageFactory factory, Message msg, Object objMessage, String strMessage,
+                    Object... params) {
+                return factory.newMessage(strMessage, params);
+            }
+
+            @Override
+            public Throwable throwable(Message msg, Throwable t) {
+                return msg.getThrowable();
+            }
+        },
+        fromObject {
+            public Message build(MessageFactory factory, Message msg, Object objMessage, String strMessage,
+                    Object... params) {
+                return factory.newMessage(objMessage);
+            }
+
+            public Throwable throwable(Message msg, Throwable t) {
+                return t;
+            }
+        },
+        fromMessage {
+            public Message build(MessageFactory factory, Message msg, Object objMessage, String strMessage,
+                    Object... params) {
+                return msg;
+            }
+
+            @Override
+            public Throwable throwable(Message msg, Throwable t) {
+                return t;
+            }
+        };
+        public abstract Message build(MessageFactory factory, Message msg, Object objMessage, String strMessage,
+                Object... params);
+
+        public abstract Throwable throwable(Message msg, Throwable t);
+    }
+
     /**
      * Checks that the message factory a logger was created with is the same as the given messageFactory. If they are
      * different log a warning to the {@linkplain StatusLogger}. A null MessageFactory translates to the default
@@ -187,9 +274,7 @@
      */
     @Override
     public void debug(final Marker marker, final Message msg) {
-        if (isEnabled(Level.DEBUG, marker, msg, null)) {
-            log(marker, FQCN, Level.DEBUG, msg, null);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.DEBUG, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -201,9 +286,7 @@
      */
     @Override
     public void debug(final Marker marker, final Message msg, final Throwable t) {
-        if (isEnabled(Level.DEBUG, marker, msg, t)) {
-            log(marker, FQCN, Level.DEBUG, msg, t);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.DEBUG, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -214,9 +297,7 @@
      */
     @Override
     public void debug(final Marker marker, final Object message) {
-        if (isEnabled(Level.DEBUG, marker, message, null)) {
-            log(marker, FQCN, Level.DEBUG, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.DEBUG, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -229,9 +310,7 @@
      */
     @Override
     public void debug(final Marker marker, final Object message, final Throwable t) {
-        if (isEnabled(Level.DEBUG, marker, message, t)) {
-            log(marker, FQCN, Level.DEBUG, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.DEBUG, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -242,9 +321,7 @@
      */
     @Override
     public void debug(final Marker marker, final String message) {
-        if (isEnabled(Level.DEBUG, marker, message)) {
-            log(marker, FQCN, Level.DEBUG, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, marker, FQCN, Level.DEBUG, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -256,10 +333,7 @@
      */
     @Override
     public void debug(final Marker marker, final String message, final Object... params) {
-        if (isEnabled(Level.DEBUG, marker, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(marker, FQCN, Level.DEBUG, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, marker, FQCN, Level.DEBUG, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -272,9 +346,7 @@
      */
     @Override
     public void debug(final Marker marker, final String message, final Throwable t) {
-        if (isEnabled(Level.DEBUG, marker, message, t)) {
-            log(marker, FQCN, Level.DEBUG, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, marker, FQCN, Level.DEBUG, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -284,9 +356,7 @@
      */
     @Override
     public void debug(final Message msg) {
-        if (isEnabled(Level.DEBUG, null, msg, null)) {
-            log(null, FQCN, Level.DEBUG, msg, null);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.DEBUG, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -297,9 +367,7 @@
      */
     @Override
     public void debug(final Message msg, final Throwable t) {
-        if (isEnabled(Level.DEBUG, null, msg, t)) {
-            log(null, FQCN, Level.DEBUG, msg, t);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.DEBUG, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -309,9 +377,7 @@
      */
     @Override
     public void debug(final Object message) {
-        if (isEnabled(Level.DEBUG, null, message, null)) {
-            log(null, FQCN, Level.DEBUG, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.DEBUG, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -323,9 +389,7 @@
      */
     @Override
     public void debug(final Object message, final Throwable t) {
-        if (isEnabled(Level.DEBUG, null, message, t)) {
-            log(null, FQCN, Level.DEBUG, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.DEBUG, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -335,9 +399,7 @@
      */
     @Override
     public void debug(final String message) {
-        if (isEnabled(Level.DEBUG, null, message)) {
-            log(null, FQCN, Level.DEBUG, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, null, FQCN, Level.DEBUG, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -348,10 +410,7 @@
      */
     @Override
     public void debug(final String message, final Object... params) {
-        if (isEnabled(Level.DEBUG, null, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(null, FQCN, Level.DEBUG, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, null, FQCN, Level.DEBUG, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -363,8 +422,14 @@
      */
     @Override
     public void debug(final String message, final Throwable t) {
-        if (isEnabled(Level.DEBUG, null, message, t)) {
-            log(null, FQCN, Level.DEBUG, messageFactory.newMessage(message), t);
+        doLog(ifStringThrowable, null, FQCN, Level.DEBUG, fromString, null, null, message, t, (Object[]) null);
+    }
+
+    protected void doLog(Enabled enabled, Marker marker, String fqcn, Level level, MsgBuilder builder, Message msg,
+            Object objMessage, String strMessage, Throwable throwable, Object... params) {
+        if (enabled.isEnabled(this, level, marker, msg, strMessage, objMessage, throwable, params)) {
+            Message actualMessage = builder.build(messageFactory, msg, objMessage, strMessage, params);
+            log(marker, fqcn, level, actualMessage, builder.throwable(actualMessage, throwable));
         }
     }
 
@@ -426,9 +491,7 @@
      */
     @Override
     public void error(final Marker marker, final Message msg) {
-        if (isEnabled(Level.ERROR, marker, msg, null)) {
-            log(marker, FQCN, Level.ERROR, msg, null);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.ERROR, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -440,9 +503,7 @@
      */
     @Override
     public void error(final Marker marker, final Message msg, final Throwable t) {
-        if (isEnabled(Level.ERROR, marker, msg, t)) {
-            log(marker, FQCN, Level.ERROR, msg, t);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.ERROR, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -453,9 +514,7 @@
      */
     @Override
     public void error(final Marker marker, final Object message) {
-        if (isEnabled(Level.ERROR, marker, message, null)) {
-            log(marker, FQCN, Level.ERROR, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.ERROR, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -468,9 +527,7 @@
      */
     @Override
     public void error(final Marker marker, final Object message, final Throwable t) {
-        if (isEnabled(Level.ERROR, marker, message, t)) {
-            log(marker, FQCN, Level.ERROR, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.ERROR, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -481,9 +538,7 @@
      */
     @Override
     public void error(final Marker marker, final String message) {
-        if (isEnabled(Level.ERROR, marker, message)) {
-            log(marker, FQCN, Level.ERROR, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, marker, FQCN, Level.ERROR, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -495,10 +550,7 @@
      */
     @Override
     public void error(final Marker marker, final String message, final Object... params) {
-        if (isEnabled(Level.ERROR, marker, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(marker, FQCN, Level.ERROR, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, marker, FQCN, Level.ERROR, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -511,9 +563,7 @@
      */
     @Override
     public void error(final Marker marker, final String message, final Throwable t) {
-        if (isEnabled(Level.ERROR, marker, message, t)) {
-            log(marker, FQCN, Level.ERROR, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, marker, FQCN, Level.ERROR, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -523,9 +573,7 @@
      */
     @Override
     public void error(final Message msg) {
-        if (isEnabled(Level.ERROR, null, msg, null)) {
-            log(null, FQCN, Level.ERROR, msg, null);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.ERROR, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -536,9 +584,7 @@
      */
     @Override
     public void error(final Message msg, final Throwable t) {
-        if (isEnabled(Level.ERROR, null, msg, t)) {
-            log(null, FQCN, Level.ERROR, msg, t);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.ERROR, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -548,9 +594,7 @@
      */
     @Override
     public void error(final Object message) {
-        if (isEnabled(Level.ERROR, null, message, null)) {
-            log(null, FQCN, Level.ERROR, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.ERROR, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -562,9 +606,7 @@
      */
     @Override
     public void error(final Object message, final Throwable t) {
-        if (isEnabled(Level.ERROR, null, message, t)) {
-            log(null, FQCN, Level.ERROR, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.ERROR, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -574,9 +616,7 @@
      */
     @Override
     public void error(final String message) {
-        if (isEnabled(Level.ERROR, null, message)) {
-            log(null, FQCN, Level.ERROR, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, null, FQCN, Level.ERROR, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -587,10 +627,7 @@
      */
     @Override
     public void error(final String message, final Object... params) {
-        if (isEnabled(Level.ERROR, null, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(null, FQCN, Level.ERROR, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, null, FQCN, Level.ERROR, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -602,9 +639,7 @@
      */
     @Override
     public void error(final String message, final Throwable t) {
-        if (isEnabled(Level.ERROR, null, message, t)) {
-            log(null, FQCN, Level.ERROR, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, null, FQCN, Level.ERROR, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -649,9 +684,7 @@
      */
     @Override
     public void fatal(final Marker marker, final Message msg) {
-        if (isEnabled(Level.FATAL, marker, msg, null)) {
-            log(marker, FQCN, Level.FATAL, msg, null);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.FATAL, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -663,9 +696,7 @@
      */
     @Override
     public void fatal(final Marker marker, final Message msg, final Throwable t) {
-        if (isEnabled(Level.FATAL, marker, msg, t)) {
-            log(marker, FQCN, Level.FATAL, msg, t);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.FATAL, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -676,9 +707,7 @@
      */
     @Override
     public void fatal(final Marker marker, final Object message) {
-        if (isEnabled(Level.FATAL, marker, message, null)) {
-            log(marker, FQCN, Level.FATAL, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.FATAL, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -691,9 +720,7 @@
      */
     @Override
     public void fatal(final Marker marker, final Object message, final Throwable t) {
-        if (isEnabled(Level.FATAL, marker, message, t)) {
-            log(marker, FQCN, Level.FATAL, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.FATAL, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -704,9 +731,7 @@
      */
     @Override
     public void fatal(final Marker marker, final String message) {
-        if (isEnabled(Level.FATAL, marker, message)) {
-            log(marker, FQCN, Level.FATAL, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, marker, FQCN, Level.FATAL, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -718,10 +743,7 @@
      */
     @Override
     public void fatal(final Marker marker, final String message, final Object... params) {
-        if (isEnabled(Level.FATAL, marker, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(marker, FQCN, Level.FATAL, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, marker, FQCN, Level.FATAL, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -734,9 +756,7 @@
      */
     @Override
     public void fatal(final Marker marker, final String message, final Throwable t) {
-        if (isEnabled(Level.FATAL, marker, message, t)) {
-            log(marker, FQCN, Level.FATAL, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, marker, FQCN, Level.FATAL, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -746,9 +766,7 @@
      */
     @Override
     public void fatal(final Message msg) {
-        if (isEnabled(Level.FATAL, null, msg, null)) {
-            log(null, FQCN, Level.FATAL, msg, null);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.FATAL, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -759,9 +777,7 @@
      */
     @Override
     public void fatal(final Message msg, final Throwable t) {
-        if (isEnabled(Level.FATAL, null, msg, t)) {
-            log(null, FQCN, Level.FATAL, msg, t);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.FATAL, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -771,9 +787,7 @@
      */
     @Override
     public void fatal(final Object message) {
-        if (isEnabled(Level.FATAL, null, message, null)) {
-            log(null, FQCN, Level.FATAL, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.FATAL, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -785,9 +799,7 @@
      */
     @Override
     public void fatal(final Object message, final Throwable t) {
-        if (isEnabled(Level.FATAL, null, message, t)) {
-            log(null, FQCN, Level.FATAL, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.FATAL, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -797,9 +809,7 @@
      */
     @Override
     public void fatal(final String message) {
-        if (isEnabled(Level.FATAL, null, message)) {
-            log(null, FQCN, Level.FATAL, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, null, FQCN, Level.FATAL, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -810,10 +820,7 @@
      */
     @Override
     public void fatal(final String message, final Object... params) {
-        if (isEnabled(Level.FATAL, null, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(null, FQCN, Level.FATAL, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, null, FQCN, Level.FATAL, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -825,9 +832,7 @@
      */
     @Override
     public void fatal(final String message, final Throwable t) {
-        if (isEnabled(Level.FATAL, null, message, t)) {
-            log(null, FQCN, Level.FATAL, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, null, FQCN, Level.FATAL, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -881,9 +886,7 @@
      */
     @Override
     public void info(final Marker marker, final Message msg) {
-        if (isEnabled(Level.INFO, marker, msg, null)) {
-            log(marker, FQCN, Level.INFO, msg, null);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.INFO, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -895,9 +898,7 @@
      */
     @Override
     public void info(final Marker marker, final Message msg, final Throwable t) {
-        if (isEnabled(Level.INFO, marker, msg, t)) {
-            log(marker, FQCN, Level.INFO, msg, t);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.INFO, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -908,9 +909,7 @@
      */
     @Override
     public void info(final Marker marker, final Object message) {
-        if (isEnabled(Level.INFO, marker, message, null)) {
-            log(marker, FQCN, Level.INFO, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.INFO, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -923,9 +922,7 @@
      */
     @Override
     public void info(final Marker marker, final Object message, final Throwable t) {
-        if (isEnabled(Level.INFO, marker, message, t)) {
-            log(marker, FQCN, Level.INFO, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.INFO, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -936,9 +933,7 @@
      */
     @Override
     public void info(final Marker marker, final String message) {
-        if (isEnabled(Level.INFO, marker, message)) {
-            log(marker, FQCN, Level.INFO, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, marker, FQCN, Level.INFO, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -950,10 +945,7 @@
      */
     @Override
     public void info(final Marker marker, final String message, final Object... params) {
-        if (isEnabled(Level.INFO, marker, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(marker, FQCN, Level.INFO, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, marker, FQCN, Level.INFO, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -966,9 +958,7 @@
      */
     @Override
     public void info(final Marker marker, final String message, final Throwable t) {
-        if (isEnabled(Level.INFO, marker, message, t)) {
-            log(marker, FQCN, Level.INFO, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, marker, FQCN, Level.INFO, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -978,9 +968,7 @@
      */
     @Override
     public void info(final Message msg) {
-        if (isEnabled(Level.INFO, null, msg, null)) {
-            log(null, FQCN, Level.INFO, msg, null);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.INFO, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -991,9 +979,7 @@
      */
     @Override
     public void info(final Message msg, final Throwable t) {
-        if (isEnabled(Level.INFO, null, msg, t)) {
-            log(null, FQCN, Level.INFO, msg, t);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.INFO, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -1003,9 +989,7 @@
      */
     @Override
     public void info(final Object message) {
-        if (isEnabled(Level.INFO, null, message, null)) {
-            log(null, FQCN, Level.INFO, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.INFO, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -1017,9 +1001,7 @@
      */
     @Override
     public void info(final Object message, final Throwable t) {
-        if (isEnabled(Level.INFO, null, message, t)) {
-            log(null, FQCN, Level.INFO, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.INFO, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -1029,9 +1011,7 @@
      */
     @Override
     public void info(final String message) {
-        if (isEnabled(Level.INFO, null, message)) {
-            log(null, FQCN, Level.INFO, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, null, FQCN, Level.INFO, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -1042,10 +1022,7 @@
      */
     @Override
     public void info(final String message, final Object... params) {
-        if (isEnabled(Level.INFO, null, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(null, FQCN, Level.INFO, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, null, FQCN, Level.INFO, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -1057,9 +1034,7 @@
      */
     @Override
     public void info(final String message, final Throwable t) {
-        if (isEnabled(Level.INFO, null, message, t)) {
-            log(null, FQCN, Level.INFO, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, null, FQCN, Level.INFO, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -1272,9 +1247,7 @@
      */
     @Override
     public void log(final Level level, final Marker marker, final Message msg) {
-        if (isEnabled(level, marker, msg, null)) {
-            log(marker, FQCN, level, msg, null);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, level, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -1287,9 +1260,7 @@
      */
     @Override
     public void log(final Level level, final Marker marker, final Message msg, final Throwable t) {
-        if (isEnabled(level, marker, msg, t)) {
-            log(marker, FQCN, level, msg, t);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, level, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -1301,9 +1272,7 @@
      */
     @Override
     public void log(final Level level, final Marker marker, final Object message) {
-        if (isEnabled(level, marker, message, null)) {
-            log(marker, FQCN, level, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, level, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -1317,9 +1286,7 @@
      */
     @Override
     public void log(final Level level, final Marker marker, final Object message, final Throwable t) {
-        if (isEnabled(level, marker, message, t)) {
-            log(marker, FQCN, level, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, level, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -1331,9 +1298,7 @@
      */
     @Override
     public void log(final Level level, final Marker marker, final String message) {
-        if (isEnabled(level, marker, message)) {
-            log(marker, FQCN, level, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, marker, FQCN, level, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -1346,10 +1311,7 @@
      */
     @Override
     public void log(final Level level, final Marker marker, final String message, final Object... params) {
-        if (isEnabled(level, marker, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(marker, FQCN, level, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, marker, FQCN, level, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -1363,9 +1325,7 @@
      */
     @Override
     public void log(final Level level, final Marker marker, final String message, final Throwable t) {
-        if (isEnabled(level, marker, message, t)) {
-            log(marker, FQCN, level, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, marker, FQCN, level, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -1376,9 +1336,7 @@
      */
     @Override
     public void log(final Level level, final Message msg) {
-        if (isEnabled(level, null, msg, null)) {
-            log(null, FQCN, level, msg, null);
-        }
+        doLog(ifMessageThrowable, null, FQCN, level, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -1390,9 +1348,7 @@
      */
     @Override
     public void log(final Level level, final Message msg, final Throwable t) {
-        if (isEnabled(level, null, msg, t)) {
-            log(null, FQCN, level, msg, t);
-        }
+        doLog(ifMessageThrowable, null, FQCN, level, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -1403,9 +1359,7 @@
      */
     @Override
     public void log(final Level level, final Object message) {
-        if (isEnabled(level, null, message, null)) {
-            log(null, FQCN, level, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, null, FQCN, level, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -1418,9 +1372,7 @@
      */
     @Override
     public void log(final Level level, final Object message, final Throwable t) {
-        if (isEnabled(level, null, message, t)) {
-            log(null, FQCN, level, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, null, FQCN, level, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -1431,9 +1383,7 @@
      */
     @Override
     public void log(final Level level, final String message) {
-        if (isEnabled(level, null, message)) {
-            log(null, FQCN, level, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, null, FQCN, level, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -1445,10 +1395,7 @@
      */
     @Override
     public void log(final Level level, final String message, final Object... params) {
-        if (isEnabled(level, null, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(null, FQCN, level, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, null, FQCN, level, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -1461,9 +1408,7 @@
      */
     @Override
     public void log(final Level level, final String message, final Throwable t) {
-        if (isEnabled(level, null, message, t)) {
-            log(null, FQCN, level, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, null, FQCN, level, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -1574,9 +1519,7 @@
      */
     @Override
     public void trace(final Marker marker, final Message msg) {
-        if (isEnabled(Level.TRACE, marker, msg, null)) {
-            log(marker, FQCN, Level.TRACE, msg, null);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.TRACE, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -1588,9 +1531,7 @@
      */
     @Override
     public void trace(final Marker marker, final Message msg, final Throwable t) {
-        if (isEnabled(Level.TRACE, marker, msg, t)) {
-            log(marker, FQCN, Level.TRACE, msg, t);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.TRACE, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -1601,9 +1542,7 @@
      */
     @Override
     public void trace(final Marker marker, final Object message) {
-        if (isEnabled(Level.TRACE, marker, message, null)) {
-            log(marker, FQCN, Level.TRACE, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.TRACE, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -1620,9 +1559,7 @@
      */
     @Override
     public void trace(final Marker marker, final Object message, final Throwable t) {
-        if (isEnabled(Level.TRACE, marker, message, t)) {
-            log(marker, FQCN, Level.TRACE, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.TRACE, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -1633,9 +1570,7 @@
      */
     @Override
     public void trace(final Marker marker, final String message) {
-        if (isEnabled(Level.TRACE, marker, message)) {
-            log(marker, FQCN, Level.TRACE, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, marker, FQCN, Level.TRACE, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -1647,10 +1582,7 @@
      */
     @Override
     public void trace(final Marker marker, final String message, final Object... params) {
-        if (isEnabled(Level.TRACE, marker, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(marker, FQCN, Level.TRACE, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, marker, FQCN, Level.TRACE, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -1667,9 +1599,7 @@
      */
     @Override
     public void trace(final Marker marker, final String message, final Throwable t) {
-        if (isEnabled(Level.TRACE, marker, message, t)) {
-            log(marker, FQCN, Level.TRACE, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, marker, FQCN, Level.TRACE, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -1679,9 +1609,7 @@
      */
     @Override
     public void trace(final Message msg) {
-        if (isEnabled(Level.TRACE, null, msg, null)) {
-            log(null, FQCN, Level.TRACE, msg, null);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.TRACE, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -1692,9 +1620,7 @@
      */
     @Override
     public void trace(final Message msg, final Throwable t) {
-        if (isEnabled(Level.TRACE, null, msg, t)) {
-            log(null, FQCN, Level.TRACE, msg, t);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.TRACE, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -1704,9 +1630,7 @@
      */
     @Override
     public void trace(final Object message) {
-        if (isEnabled(Level.TRACE, null, message, null)) {
-            log(null, FQCN, Level.TRACE, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.TRACE, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -1722,9 +1646,7 @@
      */
     @Override
     public void trace(final Object message, final Throwable t) {
-        if (isEnabled(Level.TRACE, null, message, t)) {
-            log(null, FQCN, Level.TRACE, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.TRACE, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -1734,9 +1656,7 @@
      */
     @Override
     public void trace(final String message) {
-        if (isEnabled(Level.TRACE, null, message)) {
-            log(null, FQCN, Level.TRACE, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, null, FQCN, Level.TRACE, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -1747,10 +1667,7 @@
      */
     @Override
     public void trace(final String message, final Object... params) {
-        if (isEnabled(Level.TRACE, null, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(null, FQCN, Level.TRACE, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, null, FQCN, Level.TRACE, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -1766,9 +1683,7 @@
      */
     @Override
     public void trace(final String message, final Throwable t) {
-        if (isEnabled(Level.TRACE, null, message, t)) {
-            log(null, FQCN, Level.TRACE, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, null, FQCN, Level.TRACE, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -1779,9 +1694,7 @@
      */
     @Override
     public void warn(final Marker marker, final Message msg) {
-        if (isEnabled(Level.WARN, marker, msg, null)) {
-            log(marker, FQCN, Level.WARN, msg, null);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.WARN, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -1793,9 +1706,7 @@
      */
     @Override
     public void warn(final Marker marker, final Message msg, final Throwable t) {
-        if (isEnabled(Level.WARN, marker, msg, t)) {
-            log(marker, FQCN, Level.WARN, msg, t);
-        }
+        doLog(ifMessageThrowable, marker, FQCN, Level.WARN, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -1806,9 +1717,7 @@
      */
     @Override
     public void warn(final Marker marker, final Object message) {
-        if (isEnabled(Level.WARN, marker, message, null)) {
-            log(marker, FQCN, Level.WARN, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.WARN, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /*
@@ -1826,9 +1735,7 @@
      */
     @Override
     public void warn(final Marker marker, final Object message, final Throwable t) {
-        if (isEnabled(Level.WARN, marker, message, t)) {
-            log(marker, FQCN, Level.WARN, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, marker, FQCN, Level.WARN, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -1839,9 +1746,7 @@
      */
     @Override
     public void warn(final Marker marker, final String message) {
-        if (isEnabled(Level.WARN, marker, message)) {
-            log(marker, FQCN, Level.WARN, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, marker, FQCN, Level.WARN, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -1853,10 +1758,7 @@
      */
     @Override
     public void warn(final Marker marker, final String message, final Object... params) {
-        if (isEnabled(Level.WARN, marker, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(marker, FQCN, Level.WARN, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, marker, FQCN, Level.WARN, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -1869,9 +1771,7 @@
      */
     @Override
     public void warn(final Marker marker, final String message, final Throwable t) {
-        if (isEnabled(Level.WARN, marker, message, t)) {
-            log(marker, FQCN, Level.WARN, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, marker, FQCN, Level.WARN, fromString, null, null, message, t, (Object[]) null);
     }
 
     /**
@@ -1881,9 +1781,7 @@
      */
     @Override
     public void warn(final Message msg) {
-        if (isEnabled(Level.WARN, null, msg, null)) {
-            log(null, FQCN, Level.WARN, msg, null);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.WARN, fromMessage, msg, null, null, null, (Object[]) null);
     }
 
     /**
@@ -1894,9 +1792,7 @@
      */
     @Override
     public void warn(final Message msg, final Throwable t) {
-        if (isEnabled(Level.WARN, null, msg, t)) {
-            log(null, FQCN, Level.WARN, msg, t);
-        }
+        doLog(ifMessageThrowable, null, FQCN, Level.WARN, fromMessage, msg, null, null, t, (Object[]) null);
     }
 
     /**
@@ -1906,9 +1802,7 @@
      */
     @Override
     public void warn(final Object message) {
-        if (isEnabled(Level.WARN, null, message, null)) {
-            log(null, FQCN, Level.WARN, messageFactory.newMessage(message), null);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.WARN, fromObject, null, message, null, null, (Object[]) null);
     }
 
     /**
@@ -1920,9 +1814,7 @@
      */
     @Override
     public void warn(final Object message, final Throwable t) {
-        if (isEnabled(Level.WARN, null, message, t)) {
-            log(null, FQCN, Level.WARN, messageFactory.newMessage(message), t);
-        }
+        doLog(ifObjectThrowable, null, FQCN, Level.WARN, fromObject, null, message, null, t, (Object[]) null);
     }
 
     /**
@@ -1932,9 +1824,7 @@
      */
     @Override
     public void warn(final String message) {
-        if (isEnabled(Level.WARN, null, message)) {
-            log(null, FQCN, Level.WARN, messageFactory.newMessage(message), null);
-        }
+        doLog(ifString, null, FQCN, Level.WARN, fromString, null, null, message, null, (Object[]) null);
     }
 
     /**
@@ -1945,10 +1835,7 @@
      */
     @Override
     public void warn(final String message, final Object... params) {
-        if (isEnabled(Level.WARN, null, message, params)) {
-            final Message msg = messageFactory.newMessage(message, params);
-            log(null, FQCN, Level.WARN, msg, msg.getThrowable());
-        }
+        doLog(ifStringVarargs, null, FQCN, Level.WARN, fromStringVarargs, null, null, message, null, params);
     }
 
     /**
@@ -1960,9 +1847,7 @@
      */
     @Override
     public void warn(final String message, final Throwable t) {
-        if (isEnabled(Level.WARN, null, message, t)) {
-            log(null, FQCN, Level.WARN, messageFactory.newMessage(message), t);
-        }
+        doLog(ifStringThrowable, null, FQCN, Level.WARN, fromString, null, null, message, t, (Object[]) null);
     }
 
 }