Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7924F1055C for ; Sat, 4 May 2013 06:58:57 +0000 (UTC) Received: (qmail 44191 invoked by uid 500); 4 May 2013 06:58:56 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 44138 invoked by uid 500); 4 May 2013 06:58:55 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 44108 invoked by uid 99); 4 May 2013 06:58:54 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 May 2013 06:58:54 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 May 2013 06:58:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C6ECE23888CD; Sat, 4 May 2013 06:58:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1479050 - in /logging/log4j/log4j2/trunk: core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java src/changes/changes.xml Date: Sat, 04 May 2013 06:58:30 -0000 To: commits@logging.apache.org From: rgoers@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130504065830.C6ECE23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rgoers Date: Sat May 4 06:58:30 2013 New Revision: 1479050 URL: http://svn.apache.org/r1479050 Log: LOG4J2-234 - RegexFilter threw a NullPointerException when used as a context-wide filter. Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java logging/log4j/log4j2/trunk/src/changes/changes.xml Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java?rev=1479050&r1=1479049&r2=1479050&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java Sat May 4 06:58:30 2013 @@ -57,12 +57,18 @@ public final class RegexFilter extends A @Override public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg, final Throwable t) { + if (msg == null) { + return onMismatch; + } return filter(msg.toString()); } @Override public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg, final Throwable t) { + if (msg == null) { + return onMismatch; + } final String text = useRawMessage ? msg.getFormat() : msg.getFormattedMessage(); return filter(text); } Modified: logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java?rev=1479050&r1=1479049&r2=1479050&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java (original) +++ logging/log4j/log4j2/trunk/core/src/test/java/org/apache/logging/log4j/core/filter/RegexFilterTest.java Sat May 4 06:58:30 2013 @@ -20,6 +20,7 @@ import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.Filter; import org.apache.logging.log4j.core.impl.Log4jLogEvent; import org.apache.logging.log4j.core.LogEvent; +import org.apache.logging.log4j.message.Message; import org.apache.logging.log4j.message.SimpleMessage; import org.apache.logging.log4j.status.StatusLogger; import org.junit.BeforeClass; @@ -51,4 +52,15 @@ public class RegexFilterTest { filter = RegexFilter.createFilter("* test *", null, null, null); assertNull(filter); } + + @Test + public void TestNoMsg() { + RegexFilter filter = RegexFilter.createFilter(".* test .*", null, null, null); + filter.start(); + assertTrue(filter.isStarted()); + assertTrue(filter.filter(null, Level.DEBUG, null, (String)null, (Throwable)null) == Filter.Result.DENY); + assertTrue(filter.filter(null, Level.DEBUG, null, (Message)null, (Throwable)null) == Filter.Result.DENY); + assertTrue(filter.filter(null, Level.DEBUG, null, null, (Object[])null) == Filter.Result.DENY); + + } } Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1479050&r1=1479049&r2=1479050&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/src/changes/changes.xml (original) +++ logging/log4j/log4j2/trunk/src/changes/changes.xml Sat May 4 06:58:30 2013 @@ -23,6 +23,9 @@ + + RegexFilter threw a NullPointerException when used as a context-wide filter. + Add support for interpolating Environment variables when processing the configuration.