Repository: logging-log4j2
Updated Branches:
  refs/heads/master b0fa1c19f -> 08a529fbb


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

Branch: refs/heads/master
Commit: 08a529fbb61e31bff3c342599dadc082284a85a8
Parents: b0fa1c1
Author: Gary Gregory <ggreg...@apache.org>
Authored: Tue Sep 20 16:23:27 2016 -0700
Committer: Gary Gregory <ggreg...@apache.org>
Committed: Tue Sep 20 16:23:27 2016 -0700

----------------------------------------------------------------------
 .../org/apache/logging/log4j/core/async/RingBufferLogEvent.java    | 2 +-
 .../java/org/apache/logging/log4j/core/impl/Log4jLogEvent.java     | 2 +-
 .../java/org/apache/logging/log4j/core/impl/MutableLogEvent.java   | 2 +-
 .../java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java | 2 +-
 .../org/apache/logging/log4j/core/impl/MutableLogEventTest.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/08a529fb/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
index fd273b3..5d99bb3 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/async/RingBufferLogEvent.java
@@ -432,7 +432,7 @@ public class RingBufferLogEvent implements LogEvent, 
ReusableMessage, CharSequen
      * @param builder the builder whose fields to populate
      */
     public void initializeBuilder(final Log4jLogEvent.Builder builder) {
-        builder.setContextData(contextData) //
+        builder.setMutableContextData(contextData) //
                 .setContextStack(contextStack) //
                 .setEndOfBatch(endOfBatch) //
                 .setIncludeLocation(includeLocation) //

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/08a529fb/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 f7a1749..1327271 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
@@ -200,7 +200,7 @@ public class Log4jLogEvent implements LogEvent {
             return this;
         }
 
-        public Builder setContextData(final MutableContextData contextData) {
+        public Builder setMutableContextData(final MutableContextData 
contextData) {
             this.mutableContextData = contextData;
             return this;
         }

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/08a529fb/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
index 68f7b78..3f4204e 100644
--- 
a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
+++ 
b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/MutableLogEvent.java
@@ -455,7 +455,7 @@ public class MutableLogEvent implements LogEvent, 
ReusableMessage {
      * @param builder the builder whose fields to populate
      */
     public void initializeBuilder(final Log4jLogEvent.Builder builder) {
-        builder.setContextData(contextData) //
+        builder.setMutableContextData(contextData) //
                 .setContextStack(contextStack) //
                 .setEndOfBatch(endOfBatch) //
                 .setIncludeLocation(includeLocation) //

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/08a529fb/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
index 058b997..a525715 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/Log4jLogEventTest.java
@@ -296,7 +296,7 @@ public class Log4jLogEventTest {
         final String name = "Ceci n'est pas une pipe";
         final String threadName = "threadName";
         final Log4jLogEvent event = Log4jLogEvent.newBuilder() //
-                .setContextData(contextData) //
+                .setMutableContextData(contextData) //
                 .setContextStack(contextStack) //
                 .setEndOfBatch(true) //
                 .setIncludeLocation(true) //

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/08a529fb/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
----------------------------------------------------------------------
diff --git 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
index a97dc6a..dc93102 100644
--- 
a/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
+++ 
b/log4j-core/src/test/java/org/apache/logging/log4j/core/impl/MutableLogEventTest.java
@@ -54,7 +54,7 @@ public class MutableLogEventTest {
     public void testInitFromCopiesAllFields() {
 //        private ThrowableProxy thrownProxy;
         final Log4jLogEvent source = Log4jLogEvent.newBuilder() //
-                .setContextData(CONTEXT_DATA) //
+                .setMutableContextData(CONTEXT_DATA) //
                 .setContextStack(STACK) //
                 .setEndOfBatch(true) //
                 .setIncludeLocation(true) //

Reply via email to