Author: ggregory
Date: Fri May 16 19:16:58 2014
New Revision: 1595315
URL: http://svn.apache.org/r1595315
Log:
Fix my mistake in previous commit.
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=1595315&r1=1595314&r2=1595315&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 19:16:58 2014
@@ -88,14 +88,14 @@ public class FlumeEvent extends SimpleEv
if (eventPrefix == null) {
eventPrefix = DEFAULT_EVENT_PREFIX;
}
- final Map<String, String> eventContextMap = event.getContextMap();
+ final Map<String, String> mdc = 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 (eventContextMap.containsKey(str)) {
- eventContextMap.put(str, eventContextMap.get(str));
+ if (mdc.containsKey(str)) {
+ contextMap.put(str, mdc.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 :
eventContextMap.entrySet()) {
+ for (final Map.Entry<String, String> entry : mdc.entrySet()) {
if (!list.contains(entry.getKey())) {
- eventContextMap.put(entry.getKey(), entry.getValue());
+ contextMap.put(entry.getKey(), entry.getValue());
}
}
}
} else {
- eventContextMap.putAll(eventContextMap);
+ contextMap.putAll(mdc);
}
if (required != null) {
@@ -121,7 +121,7 @@ public class FlumeEvent extends SimpleEv
if (array.length > 0) {
for (String str : array) {
str = str.trim();
- if (!eventContextMap.containsKey(str)) {
+ if (!mdc.containsKey(str)) {
throw new LoggingException("Required key " + str + "
is missing from the MDC");
}
}
@@ -140,7 +140,7 @@ public class FlumeEvent extends SimpleEv
headers.put(GUID, guid);
}
- addContextData(mdcPrefix, headers, eventContextMap);
+ addContextData(mdcPrefix, headers, contextMap);
}
protected void addStructuredData(final String prefix, final Map<String,
String> fields,
