You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/09/12 07:13:03 UTC
[1/2] logging-log4j2 git commit: Attempt to fix intermittent test
failures
Repository: logging-log4j2
Updated Branches:
refs/heads/master 6eafff1ff -> fde357353
Attempt to fix intermittent test failures
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/7c97ba8d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/7c97ba8d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/7c97ba8d
Branch: refs/heads/master
Commit: 7c97ba8dcf68bf8ed8c521660a11c5696948b2a1
Parents: 8cef181
Author: Ralph Goers <rg...@nextiva.com>
Authored: Fri Sep 11 22:12:21 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Fri Sep 11 22:12:21 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/FileConfigTest.java | 8 ++++++--
.../test/java/org/apache/logging/log4j/core/LoggerTest.java | 2 +-
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c97ba8d/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java
index 1b9face..4cb4e59 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/FileConfigTest.java
@@ -57,8 +57,12 @@ public class FileConfigTest {
for (int i = 0; i < 17; ++i) {
logger.debug("Reconfigure");
}
- Thread.sleep(100);
- final Configuration newConfig = context.getConfiguration();
+ int loopCount = 0;
+ Configuration newConfig;
+ do {
+ Thread.sleep(100);
+ newConfig = context.getConfiguration();
+ } while (newConfig == oldConfig && loopCount < 5);
assertNotSame("Reconfiguration failed", newConfig, oldConfig);
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/7c97ba8d/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
index bd60eba..327944d 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/LoggerTest.java
@@ -351,7 +351,7 @@ public class LoggerTest {
}
Thread.sleep(100);
for (int i = 0; i < 20; i++) {
- if (context.getConfiguration() == oldConfig) {
+ if (context.getConfiguration() != oldConfig) {
break;
}
Thread.sleep(50);
[2/2] logging-log4j2 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/logging-log4j2
Posted by rg...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fde35735
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fde35735
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fde35735
Branch: refs/heads/master
Commit: fde357353f4eb173ab7d5c092dfed7ef91d6470b
Parents: 7c97ba8 6eafff1
Author: Ralph Goers <rg...@nextiva.com>
Authored: Fri Sep 11 22:12:42 2015 -0700
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Fri Sep 11 22:12:42 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/jmx/Server.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------