svn commit: r1595295 - /logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java

[ggregory]

Author: ggregory
Date: Fri May 16 18:39:38 2014
New Revision: 1595295

URL: http://svn.apache.org/r1595295
Log:
Better lvar name.

Modified:
    
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java

Modified: 
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
URL: 
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java?rev=1595295&r1=1595294&r2=1595295&view=diff
==============================================================================
--- 
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
 (original)
+++ 
logging/log4j/log4j2/trunk/log4j-flume-ng/src/main/java/org/apache/logging/log4j/flume/appender/FlumeEvent.java
 Fri May 16 18:39:38 2014
@@ -88,14 +88,14 @@ public class FlumeEvent extends SimpleEv
         if (eventPrefix == null) {
             eventPrefix = DEFAULT_EVENT_PREFIX;
         }
-        final Map<String, String> mdc = event.getContextMap();
+        final Map<String, String> contextMap = event.getContextMap();
         if (includes != null) {
             final String[] array = includes.split(Patterns.COMMA_SEPARATOR);
             if (array.length > 0) {
                 for (String str : array) {
                     str = str.trim();
-                    if (mdc.containsKey(str)) {
-                        contextMap.put(str, mdc.get(str));
+                    if (contextMap.containsKey(str)) {
+                        contextMap.put(str, contextMap.get(str));
                     }
                 }
             }
@@ -106,14 +106,14 @@ public class FlumeEvent extends SimpleEv
                 for (final String value : array) {
                     list.add(value.trim());
                 }
-                for (final Map.Entry<String, String> entry : mdc.entrySet()) {
+                for (final Map.Entry<String, String> entry : 
contextMap.entrySet()) {
                     if (!list.contains(entry.getKey())) {
                         contextMap.put(entry.getKey(), entry.getValue());
                     }
                 }
             }
         } else {
-            contextMap.putAll(mdc);
+            contextMap.putAll(contextMap);
         }
 
         if (required != null) {
@@ -121,7 +121,7 @@ public class FlumeEvent extends SimpleEv
             if (array.length > 0) {
                 for (String str : array) {
                     str = str.trim();
-                    if (!mdc.containsKey(str)) {
+                    if (!contextMap.containsKey(str)) {
                         throw new LoggingException("Required key " + str + " 
is missing from the MDC");
                     }
                 }