From commits-return-8251-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Sat Nov 25 11:18:43 2017 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-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 F3AAB173B0 for ; Sat, 25 Nov 2017 11:18:42 +0000 (UTC) Received: (qmail 6430 invoked by uid 500); 25 Nov 2017 11:18:42 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 6395 invoked by uid 500); 25 Nov 2017 11:18:42 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 6386 invoked by uid 99); 25 Nov 2017 11:18:42 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Nov 2017 11:18:42 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 771283A0098 for ; Sat, 25 Nov 2017 11:18:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1816281 - /jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java Date: Sat, 25 Nov 2017 11:18:38 -0000 To: commits@jmeter.apache.org From: fschumacher@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171125111841.771283A0098@svn01-us-west.apache.org> Author: fschumacher Date: Sat Nov 25 11:18:38 2017 New Revision: 1816281 URL: http://svn.apache.org/viewvc?rev=1816281&view=rev Log: Use format strings for log messages and guard those log statements, that might call functions. Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java?rev=1816281&r1=1816280&r2=1816281&view=diff ============================================================================== --- jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java (original) +++ jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java Sat Nov 25 11:18:38 2017 @@ -80,9 +80,7 @@ public class CSVRead extends AbstractFun String fileName = ((org.apache.jmeter.engine.util.CompoundVariable) values[0]).execute(); String columnOrNext = ((org.apache.jmeter.engine.util.CompoundVariable) values[1]).execute(); - if (log.isDebugEnabled()) { - log.debug("execute (" + fileName + " , " + columnOrNext + ") "); - } + log.debug("execute ({}, {}) ", fileName, columnOrNext); // Process __CSVRead(filename,*ALIAS) if (columnOrNext.startsWith("*")) { //$NON-NLS-1$ @@ -114,16 +112,16 @@ public class CSVRead extends AbstractFun // is wanted? myValue = FileWrapper.getColumn(fileName, columnIndex); } catch (NumberFormatException e) { - log.warn(Thread.currentThread().getName() + " - can't parse column number: " + columnOrNext + " " - + e.toString()); + log.warn("{} - can't parse column number: {} {}", + Thread.currentThread().getName(), columnOrNext, + e.toString()); } catch (IndexOutOfBoundsException e) { - log.warn(Thread.currentThread().getName() + " - invalid column number: " + columnOrNext + " at row " - + FileWrapper.getCurrentRow(fileName) + " " + e.toString()); + log.warn("{} - invalid column number: {} at row {} {}", + Thread.currentThread().getName(), columnOrNext, + FileWrapper.getCurrentRow(fileName), e.toString()); } - if (log.isDebugEnabled()) { - log.debug("execute value: " + myValue); - } + log.debug("execute value: {}"); return myValue; } @@ -143,13 +141,15 @@ public class CSVRead extends AbstractFun /** {@inheritDoc} */ @Override public void setParameters(Collection parameters) throws InvalidVariableException { - log.debug("setParameter - Collection.size=" + parameters.size()); + if (log.isDebugEnabled()) { + log.debug("setParameter - Collection.size={}", parameters.size()); + } values = parameters.toArray(); if (log.isDebugEnabled()) { for (int i = 0; i < parameters.size(); i++) { - log.debug("i:" + ((CompoundVariable) values[i]).execute()); + log.debug("i: {}", ((CompoundVariable) values[i]).execute()); } }