Skip to content

[main] Fix RegexFilter NPE when useRawMsg is null (#3265 port) #4152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vpelikh wants to merge 2 commits into
base: main
Choose a base branch
from
+13 −1
Open

[main] Fix RegexFilter NPE when useRawMsg is null (#3265 port) #4152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de16d43
Fix RegexFilter NPE when useRawMsg is null (#3265)
vpelikh Jun 26, 2026
6897639
Apply spotless formatting
ramanathan1504 Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -110,4 +111,11 @@ public void testParameterizedMsg() throws Exception {
final Result fmtResult = fmtFilter.filter(null, null, null, msg, params);
assertThat(fmtResult, equalTo(Result.ACCEPT));
}

@Test
void testRegexFilterDoesNotThrowWithAllTheParametersExceptRegexEqualNull() {
assertDoesNotThrow(() -> {
RegexFilter.createFilter(".* test .*", null, null, null, null);
});
}
}
6 changes: 5 additions & 1 deletion log4j-core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ public static RegexFilter createFilter(
LOGGER.error("A regular expression must be provided for RegexFilter");
return null;
}
return new RegexFilter(useRawMsg, Pattern.compile(regex, toPatternFlags(patternFlags)), onMatch, onMismatch);
return new RegexFilter(
Boolean.TRUE.equals(useRawMsg),
Pattern.compile(regex, toPatternFlags(patternFlags)),
onMatch,
onMismatch);
}

private static int toPatternFlags(final String[] patternFlags)
Expand Down