From 965235bb54b900f7e2e2ff4d7e0c29182fda238b Mon Sep 17 00:00:00 2001 From: Andrey Plotkin Date: Fri, 2 Sep 2016 20:40:43 +0300 Subject: [PATCH] [LOG4J2-1559] Check proper value in LevelRangeFilter --- .../logging/log4j/core/filter/LevelRangeFilter.java | 2 +- .../logging/log4j/core/filter/LevelRangeFilterTest.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/LevelRangeFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/LevelRangeFilter.java index 58cb2574410..2530c415847 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/LevelRangeFilter.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/LevelRangeFilter.java @@ -61,7 +61,7 @@ public static LevelRangeFilter createFilter( @PluginAttribute("onMismatch") final Result mismatch) { // @formatter:on final Level actualMinLevel = minLevel == null ? Level.ERROR : minLevel; - final Level actualMaxLevel = minLevel == null ? Level.ERROR : maxLevel; + final Level actualMaxLevel = maxLevel == null ? Level.ERROR : maxLevel; final Result onMatch = match == null ? Result.NEUTRAL : match; final Result onMismatch = mismatch == null ? Result.DENY : mismatch; return new LevelRangeFilter(actualMinLevel, actualMaxLevel, onMatch, onMismatch); diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java index 4deb468be89..b99c6a9f3d9 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/filter/LevelRangeFilterTest.java @@ -48,4 +48,13 @@ public void testLevels() { .build(); assertSame(Filter.Result.NEUTRAL, filter.filter(event)); } + + @Test + public void testMinimumOnlyLevel() { + final LevelRangeFilter filter = LevelRangeFilter.createFilter(Level.ERROR, null, null, null); + filter.start(); + assertTrue(filter.isStarted()); + assertSame(Filter.Result.NEUTRAL, filter.filter(null, Level.ERROR, null, (Object) null, (Throwable) null)); + } + }