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 1B137105A7 for ; Tue, 9 Jul 2013 17:02:44 +0000 (UTC) Received: (qmail 92073 invoked by uid 500); 9 Jul 2013 17:02:43 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 92053 invoked by uid 500); 9 Jul 2013 17:02:43 -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 92046 invoked by uid 99); 9 Jul 2013 17:02:43 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Jul 2013 17:02:43 +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; Tue, 09 Jul 2013 17:02:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 47C732388831; Tue, 9 Jul 2013 17:02:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1501378 - in /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core: appender/rolling/TimeBasedTriggeringPolicy.java async/AsyncLoggerConfig.java filter/RegexFilter.java Date: Tue, 09 Jul 2013 17:02:19 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130709170219.47C732388831@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Tue Jul 9 17:02:18 2013 New Revision: 1501378 URL: http://svn.apache.org/r1501378 Log: The pattern 'str != null && Boolean.parseBoolean(str)' is the same as just 'Boolean.parseBoolean(str)' because Boolean.parseBoolean(String) checks for null. Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/filter/RegexFilter.java Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java?rev=1501378&r1=1501377&r2=1501378&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/rolling/TimeBasedTriggeringPolicy.java Tue Jul 9 17:02:18 2013 @@ -82,7 +82,7 @@ public final class TimeBasedTriggeringPo public static TimeBasedTriggeringPolicy createPolicy(@PluginAttr("interval") final String interval, @PluginAttr("modulate") final String modulate) { final int increment = Integers.parseInt(interval, 1); - final boolean mod = modulate == null ? false : Boolean.parseBoolean(modulate); + final boolean mod = Boolean.parseBoolean(modulate); return new TimeBasedTriggeringPolicy(increment, mod); } } Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java?rev=1501378&r1=1501377&r2=1501378&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java (original) +++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/async/AsyncLoggerConfig.java Tue Jul 9 17:02:18 2013 @@ -184,9 +184,6 @@ public class AsyncLoggerConfig extends L // Note: for asynchronous loggers, includeLocation default is FALSE protected static boolean includeLocation(final String includeLocationConfigValue) { - if (includeLocationConfigValue == null) { - return false; - } return Boolean.parseBoolean(includeLocationConfigValue); } 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=1501378&r1=1501377&r2=1501378&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 Tue Jul 9 17:02:18 2013 @@ -113,7 +113,7 @@ public final class RegexFilter extends A LOGGER.error("A regular expression must be provided for RegexFilter"); return null; } - final boolean raw = useRawMsg == null ? false : Boolean.parseBoolean(useRawMsg); + final boolean raw = Boolean.parseBoolean(useRawMsg); Pattern pattern; try { pattern = Pattern.compile(regex);