From commits-return-4543-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Tue Dec 22 11:19:24 2015 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 0130A18C1D for ; Tue, 22 Dec 2015 11:19:24 +0000 (UTC) Received: (qmail 73702 invoked by uid 500); 22 Dec 2015 11:19:23 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 73670 invoked by uid 500); 22 Dec 2015 11:19:23 -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 73661 invoked by uid 99); 22 Dec 2015 11:19:23 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Dec 2015 11:19:23 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 6B134C05A2 for ; Tue, 22 Dec 2015 11:19:23 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id jAO9sRo1zzsf for ; Tue, 22 Dec 2015 11:19:22 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id 5F0AA203BC for ; Tue, 22 Dec 2015 11:19:22 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 91278E0428 for ; Tue, 22 Dec 2015 11:19:21 +0000 (UTC) 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 91B393A0296 for ; Tue, 22 Dec 2015 11:19:21 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1721355 - /jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java Date: Tue, 22 Dec 2015 11:19:21 -0000 To: commits@jmeter.apache.org From: fschumacher@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151222111921.91B393A0296@svn01-us-west.apache.org> Author: fschumacher Date: Tue Dec 22 11:19:21 2015 New Revision: 1721355 URL: http://svn.apache.org/viewvc?rev=1721355&view=rev Log: Rename variable as it hides the instance variable metadata. Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java?rev=1721355&r1=1721354&r2=1721355&view=diff ============================================================================== --- jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java Tue Dec 22 11:19:21 2015 @@ -116,7 +116,7 @@ public class CsvSampleReader implements private SampleMetadata readMetadata(char separator, boolean useSaveSampleCfg) { try { - SampleMetadata metadata; + SampleMetadata result; // Read first line String line = reader.readLine(); if(line == null) { @@ -128,14 +128,14 @@ public class CsvSampleReader implements && CSVSaveService.getSampleSaveConfiguration(line, file.getAbsolutePath()) == null) { // Build metadata from default save config - metadata = new SampleMetadata( + result = new SampleMetadata( SampleSaveConfiguration.staticConfig()); } else { // Build metadata from headers - metadata = new SampleMetaDataParser(separator).parse(line); + result = new SampleMetaDataParser(separator).parse(line); } - return metadata; + return result; } catch (Exception e) { throw new SampleException("Could not read metadata !", e); }