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 AD11A10E7A for ; Thu, 6 Jun 2013 04:33:06 +0000 (UTC) Received: (qmail 27244 invoked by uid 500); 6 Jun 2013 04:33:06 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 26560 invoked by uid 500); 6 Jun 2013 04:33:01 -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 26520 invoked by uid 99); 6 Jun 2013 04:32:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Jun 2013 04:32:59 +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; Thu, 06 Jun 2013 04:32:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9A75C23888E3; Thu, 6 Jun 2013 04:32:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1490129 - /logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java Date: Thu, 06 Jun 2013 04:32:38 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130606043238.9A75C23888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Thu Jun 6 04:32:38 2013 New Revision: 1490129 URL: http://svn.apache.org/r1490129 Log: Refactor to make stringArgs ivar final. Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java Modified: logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java?rev=1490129&r1=1490128&r2=1490129&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java (original) +++ logging/log4j/log4j2/trunk/api/src/main/java/org/apache/logging/log4j/message/ParameterizedMessage.java Thu Jun 6 04:32:38 2013 @@ -69,7 +69,7 @@ public class ParameterizedMessage implem private static final char ESCAPE_CHAR = '\\'; private final String messagePattern; - private String[] stringArgs; + private final String[] stringArgs; private transient Object[] argArray; private transient String formattedMessage; private transient Throwable throwable; @@ -90,9 +90,7 @@ public class ParameterizedMessage implem public ParameterizedMessage(final String messagePattern, final Object[] arguments, final Throwable throwable) { this.messagePattern = messagePattern; this.throwable = throwable; - if (arguments != null) { - parseArguments(arguments); - } + this.stringArgs = parseArguments(arguments); } /** @@ -109,9 +107,7 @@ public class ParameterizedMessage implem */ public ParameterizedMessage(final String messagePattern, final Object[] arguments) { this.messagePattern = messagePattern; - if (arguments != null) { - parseArguments(arguments); - } + this.stringArgs = parseArguments(arguments); } /** @@ -133,7 +129,10 @@ public class ParameterizedMessage implem this(messagePattern, new Object[]{arg1, arg2}); } - private void parseArguments(final Object[] arguments) { + private String[] parseArguments(final Object[] arguments) { + if (arguments == null) { + return null; + } final int argsCount = countArgumentPlaceholders(messagePattern); int resultArgCount = arguments.length; if (argsCount < arguments.length) { @@ -147,16 +146,18 @@ public class ParameterizedMessage implem argArray[i] = arguments[i]; } + String[] strArgs; if (argsCount == 1 && throwable == null && arguments.length > 1) { // special case - stringArgs = new String[1]; - stringArgs[0] = deepToString(arguments); + strArgs = new String[1]; + strArgs[0] = deepToString(arguments); } else { - stringArgs = new String[resultArgCount]; - for (int i = 0; i < stringArgs.length; i++) { - stringArgs[i] = deepToString(arguments[i]); + strArgs = new String[resultArgCount]; + for (int i = 0; i < strArgs.length; i++) { + strArgs[i] = deepToString(arguments[i]); } } + return strArgs; } /**