formatting
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/102bcec0 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/102bcec0 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/102bcec0 Branch: refs/heads/LOG4J-1181 Commit: 102bcec062ec57ca67f0473e696863e60653810d Parents: d6b7f48 Author: rpopma <rpo...@apache.org> Authored: Sat Jan 9 15:58:30 2016 +0900 Committer: rpopma <rpo...@apache.org> Committed: Sat Jan 9 15:58:30 2016 +0900 ---------------------------------------------------------------------- .../logging/log4j/core/impl/Log4jLogEvent.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/102bcec0/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java index 25a32af..4fe1b38 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java @@ -85,10 +85,10 @@ public class Log4jLogEvent implements LogEvent { private boolean includeLocation; private boolean endOfBatch = false; private long nanoTime; - + public Builder() { } - + public Builder(LogEvent other) { Objects.requireNonNull(other); if (other instanceof RingBufferLogEvent) { @@ -108,7 +108,7 @@ public class Log4jLogEvent implements LogEvent { this.includeLocation = other.isIncludeLocation(); this.endOfBatch = other.isEndOfBatch(); this.nanoTime = other.getNanoTime(); - + // Avoid unnecessarily initializing thrownProxy, threadName and source if possible if (other instanceof Log4jLogEvent) { Log4jLogEvent evt = (Log4jLogEvent) other; @@ -325,7 +325,7 @@ public Log4jLogEvent(final String loggerName, final Marker marker, final String final Map<String, String> mdc, final ThreadContext.ContextStack ndc, final String threadName, final StackTraceElement location, final long timestamp) { - final Log4jLogEvent result = new Log4jLogEvent(loggerName, marker, loggerFQCN, level, message, thrown, + final Log4jLogEvent result = new Log4jLogEvent(loggerName, marker, loggerFQCN, level, message, thrown, thrownProxy, mdc, ndc, threadName, location, timestamp, nanoClock.nanoTime()); return result; } @@ -343,7 +343,7 @@ public Log4jLogEvent(final String loggerName, final Marker marker, final String * @param contextStack the nested diagnostic context. * @param threadName The name of the thread. * @param source The locations of the caller. - * @param timestamp The timestamp of the event. + * @param timestampMillis The timestamp of the event. * @param nanoTime The value of the running Java Virtual Machine's high-resolution time source when the event was * created. */ @@ -385,7 +385,7 @@ public Log4jLogEvent(final String loggerName, final Marker marker, final String } return Collections.unmodifiableMap(map); } - + /** * Returns the {@code NanoClock} to use for creating the nanoTime timestamp of log events. * @return the {@code NanoClock} to use for creating the nanoTime timestamp of log events @@ -393,20 +393,20 @@ public Log4jLogEvent(final String loggerName, final Marker marker, final String public static NanoClock getNanoClock() { return nanoClock; } - + /** * Sets the {@code NanoClock} to use for creating the nanoTime timestamp of log events. * <p> * FOR INTERNAL USE. This method may be called with a different {@code NanoClock} implementation when the * configuration changes. - * + * * @param nanoClock the {@code NanoClock} to use for creating the nanoTime timestamp of log events */ public static void setNanoClock(NanoClock nanoClock) { Log4jLogEvent.nanoClock = Objects.requireNonNull(nanoClock, "NanoClock must be non-null"); StatusLogger.getLogger().trace("Using {} for nanosecond timestamps.", nanoClock.getClass().getSimpleName()); } - + /** * Returns a new fully initialized {@code Log4jLogEvent.Builder} containing a copy of all fields of this event. * @return a new fully initialized builder.