Repository: logging-log4j2 Updated Branches: refs/heads/master 85bf1bf07 -> bfb7a3d83
[LOG4J2-2100] LevelMixIn class for Jackson is coded incorrectly. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/bfb7a3d8 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/bfb7a3d8 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/bfb7a3d8 Branch: refs/heads/master Commit: bfb7a3d83922cb2be23acef76e6aefaa074aa6d4 Parents: 85bf1bf Author: Gary Gregory <ggreg...@apache.org> Authored: Sun Nov 5 21:25:41 2017 -0700 Committer: Gary Gregory <ggreg...@apache.org> Committed: Sun Nov 5 21:25:41 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/logging/log4j/core/jackson/LevelMixIn.java | 4 ++-- src/changes/changes.xml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bfb7a3d8/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LevelMixIn.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LevelMixIn.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LevelMixIn.java index 870e817..e443bfa 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LevelMixIn.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/jackson/LevelMixIn.java @@ -34,8 +34,8 @@ import com.fasterxml.jackson.annotation.JsonValue; @JsonIgnoreProperties({ "name", "declaringClass", "standardLevel" }) abstract class LevelMixIn { - @JsonCreator - public static Level getLevel(@JsonProperty("name") final String name) { + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static Level getLevel(final String name) { return null; } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/bfb7a3d8/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 24dd3d5..89738ff 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -40,6 +40,9 @@ <action issue="LOG4J2-2091" dev="mikes" type="fix" due-to="Carter Douglas Kozak "> Log4j respects the configured "log4j2.is.webapp" property </action> + <action issue="LOG4J2-2100" dev="ggregory" type="fix"> + LevelMixIn class for Jackson is coded incorrectly + </action> <action issue="LOG4J2-2088" dev="rpopma" type="update"> Upgrade picocli to 2.0 from 0.9.8. </action>
