Author: ggregory
Date: Tue May 13 21:18:08 2014
New Revision: 1594389
URL: http://svn.apache.org/r1594389
Log:
Replace org.apache.logging.log4j.ThreadContext.clear() with the more precise
clearMap().
- [LOG4J2-634] ThrowableProxy ctor throws an exception when using suppressed
exceptions.
- [LOG4J2-584] TCP and UDP socket servers should be able to handle JSON log
events
- [LOG4J2-583] TCP and UDP socket servers should be able to handle XML log
events
Modified:
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MapEntry.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MessageSerializer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MutableThreadContextStackDeserializer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/SimpleMessageDeserializer.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/XMLEvents.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/InterpolatorTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
Modified:
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-1.2-api/src/main/java/org/apache/log4j/MDC.java
Tue May 13 21:18:08 2014
@@ -68,7 +68,7 @@ public final class MDC {
public static void clear() {
localMap.get().clear();
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
public static Hashtable<String, Object> getContext() {
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/main/java/org/apache/logging/log4j/ThreadContext.java
Tue May 13 21:18:08 2014
@@ -161,14 +161,6 @@ public final class ThreadContext {
}
/**
- * Clears the context.
- * @deprecated Use {@link #clearMap()}
- */
- public static void clear() {
- contextMap.clear();
- }
-
- /**
* Clears the context map.
*/
public static void clearMap() {
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/EventLoggerTest.java
Tue May 13 21:18:08 2014
@@ -49,7 +49,7 @@ public class EventLoggerTest {
msg.put("FromAccount", "123457");
msg.put("Amount", "200.00");
EventLogger.logEvent(msg);
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertEquals(1, results.size());
final String expected = "EVENT OFF Audit [Transfer@18060
Amount=\"200.00\" FromAccount=\"123457\" ToAccount=\"123456\"] Transfer
Complete";
assertThat("Incorrect structured data", results.get(0),
startsWith(expected));
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/LoggerTest.java
Tue May 13 21:18:08 2014
@@ -322,7 +322,7 @@ public class LoggerTest {
ThreadContext.put("TestYear", new Integer(2010).toString());
logger.debug("Debug message");
- ThreadContext.clear();
+ ThreadContext.clearMap();
logger.debug("Debug message");
assertEquals(2, results.size());
assertTrue("Incorrect MDC: " + results.get(0),
@@ -355,7 +355,7 @@ public class LoggerTest {
msg.put("FromAccount", "123457");
msg.put("Amount", "200.00");
logger.info(MarkerManager.getMarker("EVENT"), msg);
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertEquals(1, results.size());
assertThat("Incorrect structured data: ", results.get(0), startsWith(
"EVENT INFO Transfer [Audit@18060 Amount=\"200.00\"
FromAccount=\"123457\" ToAccount=\"123456\"] Transfer Complete"));
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextInheritanceTest.java
Tue May 13 21:18:08 2014
@@ -57,7 +57,7 @@ public class ThreadContextInheritanceTes
public void testInheritanceSwitchedOn() throws Exception {
System.setProperty(DefaultThreadContextMap.INHERITABLE_MAP, "true");
try {
- ThreadContext.clear();
+ ThreadContext.clearMap();
ThreadContext.put("Greeting", "Hello");
StringBuilder sb = new StringBuilder();
TestThread thread = new TestThread(sb);
@@ -80,7 +80,7 @@ public class ThreadContextInheritanceTes
@Test
public void perfTest() throws Exception {
- ThreadContext.clear();
+ ThreadContext.clearMap();
final Timer complete = new Timer("ThreadContextTest");
complete.start();
ThreadContext.put("Var1", "value 1");
@@ -108,13 +108,13 @@ public class ThreadContextInheritanceTes
@Test
public void testGetContextReturnsEmptyMapIfEmpty() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertTrue(ThreadContext.getContext().isEmpty());
}
@Test
public void testGetContextReturnsMutableCopy() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
final Map<String, String> map1 = ThreadContext.getContext();
assertTrue(map1.isEmpty());
map1.put("K", "val"); // no error
@@ -137,13 +137,13 @@ public class ThreadContextInheritanceTes
@Test
public void testGetImmutableContextReturnsEmptyMapIfEmpty() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertTrue(ThreadContext.getImmutableContext().isEmpty());
}
@Test(expected = UnsupportedOperationException.class)
public void testGetImmutableContextReturnsImmutableMapIfNonEmpty() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
ThreadContext.put("key", "val");
final Map<String, String> immutable =
ThreadContext.getImmutableContext();
immutable.put("otherkey", "otherval");
@@ -151,7 +151,7 @@ public class ThreadContextInheritanceTes
@Test(expected = UnsupportedOperationException.class)
public void testGetImmutableContextReturnsImmutableMapIfEmpty() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
final Map<String, String> immutable =
ThreadContext.getImmutableContext();
immutable.put("otherkey", "otherval");
}
@@ -164,7 +164,7 @@ public class ThreadContextInheritanceTes
@Test
public void testPut() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertNull(ThreadContext.get("testKey"));
ThreadContext.put("testKey", "testValue");
assertEquals("testValue", ThreadContext.get("testKey"));
@@ -172,7 +172,7 @@ public class ThreadContextInheritanceTes
@Test
public void testRemove() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertNull(ThreadContext.get("testKey"));
ThreadContext.put("testKey", "testValue");
assertEquals("testValue", ThreadContext.get("testKey"));
@@ -184,7 +184,7 @@ public class ThreadContextInheritanceTes
@Test
public void testContainsKey() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertFalse(ThreadContext.containsKey("testKey"));
ThreadContext.put("testKey", "testValue");
assertTrue(ThreadContext.containsKey("testKey"));
@@ -209,7 +209,7 @@ public class ThreadContextInheritanceTes
} else {
sb.append(greeting);
}
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-api/src/test/java/org/apache/logging/log4j/ThreadContextTest.java
Tue May 13 21:18:08 2014
@@ -40,7 +40,7 @@ public class ThreadContextTest {
@Test
public void testInheritanceSwitchedOffByDefault() throws Exception {
- ThreadContext.clear();
+ ThreadContext.clearMap();
ThreadContext.put("Greeting", "Hello");
StringBuilder sb = new StringBuilder();
TestThread thread = new TestThread(sb);
@@ -60,7 +60,7 @@ public class ThreadContextTest {
@Test
public void perfTest() throws Exception {
- ThreadContext.clear();
+ ThreadContext.clearMap();
final Timer complete = new Timer("ThreadContextTest");
complete.start();
ThreadContext.put("Var1", "value 1");
@@ -88,13 +88,13 @@ public class ThreadContextTest {
@Test
public void testGetContextReturnsEmptyMapIfEmpty() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertTrue(ThreadContext.getContext().isEmpty());
}
@Test
public void testGetContextReturnsMutableCopy() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
final Map<String, String> map1 = ThreadContext.getContext();
assertTrue(map1.isEmpty());
map1.put("K", "val"); // no error
@@ -117,13 +117,13 @@ public class ThreadContextTest {
@Test
public void testGetImmutableContextReturnsEmptyMapIfEmpty() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertTrue(ThreadContext.getImmutableContext().isEmpty());
}
@Test(expected = UnsupportedOperationException.class)
public void testGetImmutableContextReturnsImmutableMapIfNonEmpty() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
ThreadContext.put("key", "val");
final Map<String, String> immutable =
ThreadContext.getImmutableContext();
immutable.put("otherkey", "otherval");
@@ -131,7 +131,7 @@ public class ThreadContextTest {
@Test(expected = UnsupportedOperationException.class)
public void testGetImmutableContextReturnsImmutableMapIfEmpty() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
final Map<String, String> immutable =
ThreadContext.getImmutableContext();
immutable.put("otherkey", "otherval");
}
@@ -144,7 +144,7 @@ public class ThreadContextTest {
@Test
public void testPut() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertNull(ThreadContext.get("testKey"));
ThreadContext.put("testKey", "testValue");
assertEquals("testValue", ThreadContext.get("testKey"));
@@ -152,7 +152,7 @@ public class ThreadContextTest {
@Test
public void testRemove() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertNull(ThreadContext.get("testKey"));
ThreadContext.put("testKey", "testValue");
assertEquals("testValue", ThreadContext.get("testKey"));
@@ -164,7 +164,7 @@ public class ThreadContextTest {
@Test
public void testContainsKey() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
assertFalse(ThreadContext.containsKey("testKey"));
ThreadContext.put("testKey", "testValue");
assertTrue(ThreadContext.containsKey("testKey"));
@@ -189,7 +189,7 @@ public class ThreadContextTest {
} else {
sb.append(greeting);
}
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/osgi/Activator.java
Tue May 13 21:18:08 2014
@@ -33,7 +33,7 @@ import org.osgi.framework.BundleListener
/**
* OSGi BundleActivator.
*/
-public class Activator implements org.osgi.framework.BundleActivator {
+public final class Activator implements org.osgi.framework.BundleActivator {
private static final Logger LOGGER = StatusLogger.getLogger();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jStackTraceElementDeserializer.java
Tue May 13 21:18:08 2014
@@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.de
* <em>Consider this class private.</em>
* </p>
*/
-public class Log4jStackTraceElementDeserializer extends
StdScalarDeserializer<StackTraceElement> {
+public final class Log4jStackTraceElementDeserializer extends
StdScalarDeserializer<StackTraceElement> {
private static final long serialVersionUID = 1L;
/**
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/Log4jXmlModule.java
Tue May 13 21:18:08 2014
@@ -26,7 +26,7 @@ import com.fasterxml.jackson.dataformat.
* <em>Consider this class private.</em>
* </p>
*/
-class Log4jXmlModule extends JacksonXmlModule {
+final class Log4jXmlModule extends JacksonXmlModule {
private static final long serialVersionUID = 1L;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MapEntry.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MapEntry.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MapEntry.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MapEntry.java
Tue May 13 21:18:08 2014
@@ -33,7 +33,7 @@ import com.fasterxml.jackson.dataformat.
* </p>
*/
@JsonPropertyOrder({ "key", "value" })
-class MapEntry {
+final class MapEntry {
@JsonProperty
@JacksonXmlProperty(isAttribute = true)
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MessageSerializer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MessageSerializer.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MessageSerializer.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MessageSerializer.java
Tue May 13 21:18:08 2014
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.se
* <em>Consider this class private.</em>
* </p>
*/
-class MessageSerializer extends StdScalarSerializer<Message> {
+final class MessageSerializer extends StdScalarSerializer<Message> {
MessageSerializer() {
super(Message.class);
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MutableThreadContextStackDeserializer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MutableThreadContextStackDeserializer.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MutableThreadContextStackDeserializer.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/MutableThreadContextStackDeserializer.java
Tue May 13 21:18:08 2014
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.databind.de
* <em>Consider this class private.</em>
* </p>
*/
-class MutableThreadContextStackDeserializer extends
StdDeserializer<MutableThreadContextStack> {
+final class MutableThreadContextStackDeserializer extends
StdDeserializer<MutableThreadContextStack> {
private static final long serialVersionUID = 1L;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/SimpleMessageDeserializer.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/SimpleMessageDeserializer.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/SimpleMessageDeserializer.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/SimpleMessageDeserializer.java
Tue May 13 21:18:08 2014
@@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.de
* <em>Consider this class private.</em>
* </p>
*/
-public class SimpleMessageDeserializer extends
StdScalarDeserializer<SimpleMessage> {
+public final class SimpleMessageDeserializer extends
StdScalarDeserializer<SimpleMessage> {
private static final long serialVersionUID = 1L;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONConstants.java
Tue May 13 21:18:08 2014
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.la
/**
* Keeps constants separate from any class that may depend on third party jars.
*/
-public class JSONConstants {
+public final class JSONConstants {
public static final String PROP_SOURCE = "source";
public static final String PROP_CONTEXT_MAP = "contextMap";
}
\ No newline at end of file
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/JSONLayout.java
Tue May 13 21:18:08 2014
@@ -790,7 +790,7 @@ import org.apache.logging.log4j.core.uti
* </p>
*/
@Plugin(name = "JSONLayout", category = "Core", elementType = "layout",
printObject = true)
-public class JSONLayout extends AbstractJacksonLayout {
+public final class JSONLayout extends AbstractJacksonLayout {
protected JSONLayout(final boolean locationInfo, final boolean properties,
final boolean complete, final boolean compact,
final Charset charset) {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/RFC5424Layout.java
Tue May 13 21:18:08 2014
@@ -62,7 +62,7 @@ import org.apache.logging.log4j.util.Str
* @see <a href="https://tools.ietf.org/html/rfc5424";>RFC 5424</a>
*/
@Plugin(name = "RFC5424Layout", category = "Core", elementType = "layout",
printObject = true)
-public class RFC5424Layout extends AbstractStringLayout {
+public final class RFC5424Layout extends AbstractStringLayout {
private static final String LF = "\n";
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/SyslogLayout.java
Tue May 13 21:18:08 2014
@@ -40,7 +40,7 @@ import org.apache.logging.log4j.core.uti
* Formats a log event as a BSD Log record.
*/
@Plugin(name = "SyslogLayout", category = "Core", elementType = "layout",
printObject = true)
-public class SyslogLayout extends AbstractStringLayout {
+public final class SyslogLayout extends AbstractStringLayout {
/**
* Match newlines in a platform-independent manner.
*/
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLConstants.java
Tue May 13 21:18:08 2014
@@ -19,7 +19,7 @@ package org.apache.logging.log4j.core.la
/**
* Keeps constants separate from any class that may depend on third party jars.
*/
-public class XMLConstants {
+public final class XMLConstants {
public static final String TAG_SOURCE = "Source";
public static final String TAG_CONTEXT_MAP = "ContextMap";
public static final String XML_NAMESPACE =
"http://logging.apache.org/log4j/2.0/events";;
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/XMLLayout.java
Tue May 13 21:18:08 2014
@@ -184,7 +184,7 @@ import org.apache.logging.log4j.core.uti
* </p>
*/
@Plugin(name = "XMLLayout", category = "Core", elementType = "layout",
printObject = true)
-public class XMLLayout extends AbstractJacksonLayout {
+public final class XMLLayout extends AbstractJacksonLayout {
private static final String ROOT_TAG = "Events";
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
Tue May 13 21:18:08 2014
@@ -204,7 +204,7 @@ public class LoggerTest {
public void mdc() {
ThreadContext.put("TestYear", "2010");
logger.debug("Debug message");
- ThreadContext.clear();
+ ThreadContext.clearMap();
logger.debug("Debug message");
final List<LogEvent> events = app.getEvents();
assertTrue("Incorrect number of events. Expected 2, actual " +
events.size(), events.size() == 2);
@@ -221,7 +221,7 @@ public class LoggerTest {
msg.put("FromAccount", "123457");
msg.put("Amount", "200.00");
logger.info(MarkerManager.getMarker("EVENT"), msg);
- ThreadContext.clear();
+ ThreadContext.clearMap();
final List<LogEvent> events = app.getEvents();
assertTrue("Incorrect number of events. Expected 1, actual " +
events.size(), events.size() == 1);
app.clear();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/StrictXMLConfigTest.java
Tue May 13 21:18:08 2014
@@ -136,7 +136,7 @@ public class StrictXMLConfigTest {
ThreadContext.put("TestYear", "2010");
logger.debug("Debug message");
- ThreadContext.clear();
+ ThreadContext.clearMap();
logger.debug("Debug message");
final List<LogEvent> events = app.getEvents();
assertTrue("Incorrect number of events. Expected 2, actual " +
events.size(), events.size() == 2);
@@ -153,7 +153,7 @@ public class StrictXMLConfigTest {
msg.put("FromAccount", "123457");
msg.put("Amount", "200.00");
logger.info(MarkerManager.getMarker("EVENT"), msg);
- ThreadContext.clear();
+ ThreadContext.clearMap();
final List<LogEvent> events = app.getEvents();
assertTrue("Incorrect number of events. Expected 1, actual " +
events.size(), events.size() == 1);
app.clear();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/XMLEvents.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/XMLEvents.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/XMLEvents.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/XMLEvents.java
Tue May 13 21:18:08 2014
@@ -49,7 +49,7 @@ public class XMLEvents {
EventLogger.logEvent(msg);
msg.setCompletionStatus("Transfer Complete");
EventLogger.logEvent(msg);
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/DynamicThresholdFilterTest.java
Tue May 13 21:18:08 2014
@@ -60,14 +60,14 @@ public class DynamicThresholdFilterTest
assertTrue(filter.isStarted());
assertTrue(filter.filter(null, Level.DEBUG, null, null,
(Throwable)null) == Filter.Result.NEUTRAL);
assertTrue(filter.filter(null, Level.ERROR, null, null,
(Throwable)null) == Filter.Result.NEUTRAL);
- ThreadContext.clear();
+ ThreadContext.clearMap();
ThreadContext.put("userid", "JohnDoe");
ThreadContext.put("organization", "apache");
LogEvent event = new Log4jLogEvent(null, null, null, Level.DEBUG, new
SimpleMessage("Test"), null);
assertTrue(filter.filter(event) == Filter.Result.DENY);
event = new Log4jLogEvent(null, null, null, Level.ERROR, new
SimpleMessage("Test"), null);
assertTrue(filter.filter(event) == Filter.Result.NEUTRAL);
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
@Test
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/ThreadContextMapFilterTest.java
Tue May 13 21:18:08 2014
@@ -46,7 +46,7 @@ public class ThreadContextMapFilterTest
assertTrue(filter.filter(null, Level.ERROR, null, null,
(Throwable)null) == Filter.Result.NEUTRAL);
ThreadContext.put("organization", "ASF");
assertTrue(filter.filter(null, Level.DEBUG, null, null,
(Throwable)null) == Filter.Result.DENY);
- ThreadContext.clear();
+ ThreadContext.clearMap();
filter = ThreadContextMapFilter.createFilter(pairs, "or", null, null);
filter.start();
assertTrue(filter.isStarted());
@@ -62,6 +62,6 @@ public class ThreadContextMapFilterTest
filter.start();
assertTrue(filter.isStarted());
assertTrue(filter.filter(null, Level.DEBUG, null, null,
(Throwable)null) == Filter.Result.NEUTRAL);
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/PatternLayoutTest.java
Tue May 13 21:18:08 2014
@@ -62,7 +62,7 @@ public class PatternLayoutTest {
@After
public void after() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
LoggerContext ctx = (LoggerContext) LogManager.getContext();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/RFC5424LayoutTest.java
Tue May 13 21:18:08 2014
@@ -147,7 +147,7 @@ public class RFC5424LayoutTest {
assertTrue("No messages expected, found " + list.size(),
list.size() == 0);
} finally {
root.removeAppender(appender);
- ThreadContext.clear();
+ ThreadContext.clearMap();
appender.stop();
}
@@ -209,7 +209,7 @@ public class RFC5424LayoutTest {
assertTrue("No messages expected, found " + list.size(),
list.size() == 0);
} finally {
root.removeAppender(appender);
- ThreadContext.clear();
+ ThreadContext.clearMap();
appender.stop();
}
@@ -249,7 +249,7 @@ public class RFC5424LayoutTest {
appender.clear();
} finally {
root.removeAppender(appender);
- ThreadContext.clear();
+ ThreadContext.clearMap();
appender.stop();
}
@@ -291,7 +291,7 @@ public class RFC5424LayoutTest {
appender.clear();
} finally {
root.removeAppender(appender);
- ThreadContext.clear();
+ ThreadContext.clearMap();
appender.stop();
}
@@ -340,7 +340,7 @@ public class RFC5424LayoutTest {
appender.clear();
} finally {
root.removeAppender(appender);
- ThreadContext.clear();
+ ThreadContext.clearMap();
appender.stop();
}
@@ -388,7 +388,7 @@ public class RFC5424LayoutTest {
appender.clear();
} finally {
root.removeAppender(appender);
- ThreadContext.clear();
+ ThreadContext.clearMap();
appender.stop();
}
@@ -422,7 +422,7 @@ public class RFC5424LayoutTest {
appender.clear();
} finally {
root.removeAppender(appender);
- ThreadContext.clear();
+ ThreadContext.clearMap();
appender.stop();
}
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/SyslogLayoutTest.java
Tue May 13 21:18:08 2014
@@ -106,7 +106,7 @@ public class SyslogLayoutTest {
msg.put("Amount", "200.00");
root.info(MarkerManager.getMarker("EVENT"), msg);
- ThreadContext.clear();
+ ThreadContext.clearMap();
appender.stop();
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/InterpolatorTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/InterpolatorTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/InterpolatorTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/lookup/InterpolatorTest.java
Tue May 13 21:18:08 2014
@@ -76,7 +76,7 @@ public class InterpolatorTest {
assertEquals(TESTVAL, value);
value = lookup.lookup("BadKey");
assertNull(value);
- ThreadContext.clear();
+ ThreadContext.clearMap();
value = lookup.lookup("ctx:" + TESTKEY);
assertEquals(TESTVAL, value);
value = lookup.lookup("jndi:" + TEST_CONTEXT_RESOURCE_NAME);
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSQueueFailoverTest.java
Tue May 13 21:18:08 2014
@@ -87,7 +87,7 @@ public class JMSQueueFailoverTest {
}
assertNotNull("No Appender", app);
app.clear();
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
private static void setupQueue() throws Exception {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/net/jms/JMSTopicFailoverTest.java
Tue May 13 21:18:08 2014
@@ -86,7 +86,7 @@ public class JMSTopicFailoverTest {
}
assertNotNull("No Appender", app);
app.clear();
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
private static void setupQueue() throws Exception {
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/test/java/org/apache/logging/log4j/core/pattern/RegexReplacementTest.java
Tue May 13 21:18:08 2014
@@ -68,7 +68,7 @@ public class RegexReplacementTest {
System.clearProperty(ConfigurationFactory.CONFIGURATION_FILE_PROPERTY);
ctx.reconfigure();
StatusLogger.getLogger().reset();
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
org.apache.logging.log4j.Logger logger =
LogManager.getLogger("LoggerTest");
Modified:
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingApp.java
Tue May 13 21:18:08 2014
@@ -52,7 +52,7 @@ public class LoggingApp {
public LoggingApp(final String member) {
- ThreadContext.clear();
+ ThreadContext.clearMap();
RequestContext.setSessionId("session1234");
RequestContext.setIpAddress("127.0.0.1");
Modified:
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/app/LoggingController.java
Tue May 13 21:18:08 2014
@@ -85,7 +85,7 @@ public class LoggingController {
@Override
public void run() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
RequestContext.setSessionId("session1234");
RequestContext.setIpAddress("127.0.0.1");
Modified:
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-samples/flume-common/src/main/java/org/apache/logging/log4j/samples/dto/RequestContext.java
Tue May 13 21:18:08 2014
@@ -56,7 +56,7 @@ public final class RequestContext {
public static final String USER_AGENT = "userAgent";
public static void initialize() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
ThreadContext.put(REQUEST_ID, UUIDUtil.getTimeBasedUUID().toString());
}
Modified:
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMDCAdapter.java
Tue May 13 21:18:08 2014
@@ -43,7 +43,7 @@ public class Log4jMDCAdapter implements
@Override
public void clear() {
- ThreadContext.clear();
+ ThreadContext.clearMap();
}
@Override
@@ -54,7 +54,7 @@ public class Log4jMDCAdapter implements
@Override
@SuppressWarnings("unchecked") // nothing we can do about this, restricted
by SLF4J API
public void setContextMap(@SuppressWarnings("rawtypes") final Map map) {
- ThreadContext.clear();
+ ThreadContext.clearMap();
for (final Map.Entry<String, String> entry : ((Map<String, String>)
map).entrySet()) {
ThreadContext.put(entry.getKey(), entry.getValue());
}
Modified:
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java?rev=1594389&r1=1594388&r2=1594389&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-to-slf4j/src/test/java/org/apache/logging/slf4j/LoggerTest.java
Tue May 13 21:18:08 2014
@@ -167,7 +167,7 @@ public class LoggerTest {
public void mdc() {
ThreadContext.put("TestYear", new Integer(2010).toString());
logger.debug("Debug message");
- ThreadContext.clear();
+ ThreadContext.clearMap();
logger.debug("Debug message");
assertTrue("Incorrect number of events. Expected 2, actual " +
list.strList.size(), list.strList.size() == 2);
assertTrue("Incorrect year", list.strList.get(0).startsWith("2010"));
