Repository: logging-log4j2 Updated Branches: refs/heads/master 4cd26b638 -> 0bea17d76
[LOG4J2-813] MarkerManager Log4jMarker.hasParents() returns opposite of correct result. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/0bea17d7 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/0bea17d7 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/0bea17d7 Branch: refs/heads/master Commit: 0bea17d76243bdd60759465d25c03eb4b9a3e0c6 Parents: 4cd26b6 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Fri Sep 19 21:39:25 2014 -0400 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Fri Sep 19 21:39:25 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/logging/log4j/MarkerManager.java | 2 +- .../src/test/java/org/apache/logging/log4j/MarkerTest.java | 9 +++++++++ src/changes/changes.xml | 3 +++ 3 files changed, 13 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0bea17d7/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java b/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java index 2dea94e..5bf38e1 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/MarkerManager.java @@ -228,7 +228,7 @@ public final class MarkerManager { @Override public boolean hasParents() { - return this.parents == null; + return this.parents != null; } @Override http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0bea17d7/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java b/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java index 004aed8..2874016 100644 --- a/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java +++ b/log4j-api/src/test/java/org/apache/logging/log4j/MarkerTest.java @@ -49,6 +49,15 @@ public class MarkerTest { } @Test + public void testHasParents() { + final Marker parent = MarkerManager.getMarker("PARENT"); + final Marker existing = MarkerManager.getMarker("EXISTING"); + assertFalse(existing.hasParents()); + existing.setParents(parent); + assertTrue(existing.hasParents()); + } + + @Test public void testMarker() { final Marker parent = MarkerManager.getMarker("PARENT"); final Marker test1 = MarkerManager.getMarker("TEST1").setParents(parent); http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/0bea17d7/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index ed590bd..ccd227d 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -24,6 +24,9 @@ </properties> <body> <release version="2.1" date="2014-??-??" description="Bug fixes and enhancements"> + <action issue="LOG4J2-813" dev="ggregory" type="fix" due-to="Brandon Barry"> + MarkerManager Log4jMarker.hasParents() returns opposite of correct result. + </action> <action issue="LOG4J2-785" dev="rpopma" type="fix"> Fixed capitalization inconsistency in user manual example config. </action>
