Repository: logging-log4j2 Updated Branches: refs/heads/master 44fb72b24 -> 9c3464681
Better ivar name. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9c346468 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9c346468 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9c346468 Branch: refs/heads/master Commit: 9c34646818f41922039c551cd49b00317106d153 Parents: 44fb72b Author: Gary Gregory <[email protected]> Authored: Tue Sep 20 16:20:55 2016 -0700 Committer: Gary Gregory <[email protected]> Committed: Tue Sep 20 16:20:55 2016 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/impl/Log4jLogEvent.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9c346468/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 af18b64..f6b87df 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 @@ -63,7 +63,7 @@ public class Log4jLogEvent implements LogEvent { private final long timeMillis; private final transient Throwable thrown; private ThrowableProxy thrownProxy; - private final MutableContextData contextData; + private final MutableContextData mutableContextData; private final ThreadContext.ContextStack contextStack; private long threadId; private String threadName; @@ -123,7 +123,7 @@ public class Log4jLogEvent implements LogEvent { // Avoid unnecessarily initializing thrownProxy, threadName and source if possible if (other instanceof Log4jLogEvent) { final Log4jLogEvent evt = (Log4jLogEvent) other; - this.contextData = evt.contextData; + this.contextData = evt.mutableContextData; this.thrownProxy = evt.thrownProxy; this.source = evt.source; this.threadId = evt.threadId; @@ -410,7 +410,7 @@ public class Log4jLogEvent implements LogEvent { this.message = message; this.thrown = thrown; this.thrownProxy = thrownProxy; - this.contextData = contextData == null ? ContextDataFactory.createContextData() : contextData; + this.mutableContextData = contextData == null ? ContextDataFactory.createContextData() : contextData; this.contextStack = contextStack == null ? ThreadContext.EMPTY_STACK : contextStack; this.timeMillis = message instanceof TimestampMessage ? ((TimestampMessage) message).getTimestamp() @@ -584,7 +584,7 @@ public class Log4jLogEvent implements LogEvent { */ @Override public ContextData getContextData() { - return contextData; + return mutableContextData; } /** * Returns the immutable copy of the ThreadContext Map. @@ -592,7 +592,7 @@ public class Log4jLogEvent implements LogEvent { */ @Override public Map<String, String> getContextMap() { - return contextData.toMap(); + return mutableContextData.toMap(); } /** @@ -781,7 +781,7 @@ public class Log4jLogEvent implements LogEvent { if (marker != null ? !marker.equals(that.marker) : that.marker != null) { return false; } - if (contextData != null ? !contextData.equals(that.contextData) : that.contextData != null) { + if (mutableContextData != null ? !mutableContextData.equals(that.mutableContextData) : that.mutableContextData != null) { return false; } if (!message.equals(that.message)) { @@ -824,7 +824,7 @@ public class Log4jLogEvent implements LogEvent { result = 31 * result + (int) (nanoTime ^ (nanoTime >>> 32)); result = 31 * result + (thrown != null ? thrown.hashCode() : 0); result = 31 * result + (thrownProxy != null ? thrownProxy.hashCode() : 0); - result = 31 * result + (contextData != null ? contextData.hashCode() : 0); + result = 31 * result + (mutableContextData != null ? mutableContextData.hashCode() : 0); result = 31 * result + (contextStack != null ? contextStack.hashCode() : 0); result = 31 * result + (int) (threadId ^ (threadId >>> 32)); result = 31 * result + (threadName != null ? threadName.hashCode() : 0); @@ -875,7 +875,7 @@ public class Log4jLogEvent implements LogEvent { this.timeMillis = event.timeMillis; this.thrown = event.thrown; this.thrownProxy = event.thrownProxy; - this.contextData = event.contextData; + this.contextData = event.mutableContextData; this.contextStack = event.contextStack; this.source = includeLocation ? event.getSource() : null; this.threadId = event.getThreadId();
