You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2017/07/30 22:42:48 UTC
logging-log4j2 git commit: Revert "[LOG4J2-1990]
ConcurrentModificationException logging a parameter of type Map. Another go
at it based on Ralph's suggestion."
Repository: logging-log4j2
Updated Branches:
refs/heads/master 005139d6a -> bfdb2f533
Revert "[LOG4J2-1990] ConcurrentModificationException logging a parameter of type Map. Another go at it based on Ralph's suggestion."
This reverts commit 68de0ff88936cc2e8f77b3a67e6c495c390ea7be.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bfdb2f53
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bfdb2f53
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bfdb2f53
Branch: refs/heads/master
Commit: bfdb2f533ca569606dd8d62fdd15b0f706404ac6
Parents: 005139d
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Jul 30 15:42:04 2017 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Jul 30 15:42:04 2017 -0700
----------------------------------------------------------------------
.../logging/log4j/core/appender/SocketAppenderTest.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bfdb2f53/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 e76b634..1d43481 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,8 +267,15 @@ public class SocketAppenderTest {
logger.addAppender(appender);
logger.setAdditive(false);
logger.setLevel(Level.DEBUG);
- //
- logger.debug("This message is written because of the new reconnect logic LOG4J-1990");
+
+ 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();
+ }
}
public static class UdpSocketTestServer extends Thread {