Repository: logging-log4j2
Updated Branches:
  refs/heads/master 961655bbe -> b0fa1c19f


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/b0fa1c19
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b0fa1c19
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b0fa1c19

Branch: refs/heads/master
Commit: b0fa1c19f50333344661fcbd17c0f10b7606e406
Parents: 961655b
Author: Gary Gregory <ggreg...@apache.org>
Authored: Tue Sep 20 16:22:36 2016 -0700
Committer: Gary Gregory <ggreg...@apache.org>
Committed: Tue Sep 20 16:22:36 2016 -0700

----------------------------------------------------------------------
 .../logging/log4j/core/impl/Log4jLogEvent.java  | 22 ++++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b0fa1c19/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 146ce23..f7a1749 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,7 +85,7 @@ public class Log4jLogEvent implements LogEvent {
         private Throwable thrown;
         private long timeMillis = CLOCK.currentTimeMillis();
         private ThrowableProxy thrownProxy;
-        private MutableContextData contextData = 
createContextData((List<Property>) null);
+        private MutableContextData mutableContextData = 
createContextData((List<Property>) null);
         private ThreadContext.ContextStack contextStack = 
ThreadContext.getImmutableStack();
         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.mutableContextData;
+                this.mutableContextData = evt.mutableContextData;
                 this.thrownProxy = evt.thrownProxy;
                 this.source = evt.source;
                 this.threadId = evt.threadId;
@@ -131,14 +131,14 @@ public class Log4jLogEvent implements LogEvent {
                 this.threadPriority = evt.threadPriority;
             } else {
                 if (other.getContextData() instanceof MutableContextData) {
-                    this.contextData = (MutableContextData) 
other.getContextData();
+                    this.mutableContextData = (MutableContextData) 
other.getContextData();
                 } else {
-                    if (this.contextData.isFrozen()) {
-                        this.contextData = 
ContextDataFactory.createContextData();
+                    if (this.mutableContextData.isFrozen()) {
+                        this.mutableContextData = 
ContextDataFactory.createContextData();
                     } else {
-                        this.contextData.clear();
+                        this.mutableContextData.clear();
                     }
-                    this.contextData.putAll(other.getContextData());
+                    this.mutableContextData.putAll(other.getContextData());
 
                 }
                 this.thrownProxy = other.getThrownProxy();
@@ -191,17 +191,17 @@ public class Log4jLogEvent implements LogEvent {
 
         @Deprecated
         public Builder setContextMap(final Map<String, String> contextMap) {
-            contextData = ContextDataFactory.createContextData(); // replace 
with new instance
+            mutableContextData = ContextDataFactory.createContextData(); // 
replace with new instance
             if (contextMap != null) {
                 for (final Map.Entry<String, String> entry : 
contextMap.entrySet()) {
-                    contextData.putValue(entry.getKey(), entry.getValue());
+                    mutableContextData.putValue(entry.getKey(), 
entry.getValue());
                 }
             }
             return this;
         }
 
         public Builder setContextData(final MutableContextData contextData) {
-            this.contextData = contextData;
+            this.mutableContextData = contextData;
             return this;
         }
 
@@ -254,7 +254,7 @@ public class Log4jLogEvent implements LogEvent {
         @Override
         public Log4jLogEvent build() {
             final Log4jLogEvent result = new Log4jLogEvent(loggerName, marker, 
loggerFqcn, level, message, thrown,
-                    thrownProxy, contextData, contextStack, threadId, 
threadName, threadPriority, source, timeMillis,
+                    thrownProxy, mutableContextData, contextStack, threadId, 
threadName, threadPriority, source, timeMillis,
                     nanoTime);
             result.setIncludeLocation(includeLocation);
             result.setEndOfBatch(endOfBatch);

Reply via email to