Repository: logging-log4j2 Updated Branches: refs/heads/master 3c3a9e4a1 -> 68de0ff88
[LOG4J2-1990] ConcurrentModificationException logging a parameter of type Map. Another go at it based on Ralph's suggestion. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/68de0ff8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/68de0ff8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/68de0ff8 Branch: refs/heads/master Commit: 68de0ff88936cc2e8f77b3a67e6c495c390ea7be Parents: 3c3a9e4 Author: Gary Gregory <[email protected]> Authored: Sat Jul 29 20:13:19 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Sat Jul 29 20:13:19 2017 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/appender/SocketAppenderTest.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/68de0ff8/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java index 1d43481..e76b634 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java @@ -267,15 +267,8 @@ public class SocketAppenderTest { logger.addAppender(appender); logger.setAdditive(false); logger.setLevel(Level.DEBUG); - - try { - logger.debug("This message is written because a deadlock never."); - fail("No Exception was thrown"); - } catch (final Exception ex) { - // TODO: move exception to @Test(expect = Exception.class) - // Failure is expected. - // ex.printStackTrace(); - } + // + logger.debug("This message is written because of the new reconnect logic LOG4J-1990"); } public static class UdpSocketTestServer extends Thread {
