svn commit: r1382180 - in /jmeter/trunk: bin/saveservice.properties src/core/org/apache/jmeter/save/CSVSaveService.java xdocs/changes.xml

[pm...@apache.org]

Author: pmouawad
Date: Fri Sep  7 21:27:24 2012
New Revision: 1382180

URL: http://svn.apache.org/viewvc?rev=1382180&view=rev
Log:
Bug 53841 - CSVSaveService reads file using JVM default file encoding instead of using the one configured in saveservice.properties
Bugzilla Id: 53841

Modified:
    jmeter/trunk/bin/saveservice.properties
    jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
    jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/saveservice.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/saveservice.properties?rev=1382180&r1=1382179&r2=1382180&view=diff
==============================================================================
--- jmeter/trunk/bin/saveservice.properties (original)
+++ jmeter/trunk/bin/saveservice.properties Fri Sep  7 21:27:24 2012
@@ -47,7 +47,7 @@ _file_version=$Revision$
 _version=2.3
 #
 #
-# Character set encoding used to read and write JMeter XML files
+# Character set encoding used to read and write JMeter XML files and CSV results
 #
 _file_encoding=UTF-8
 #

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=1382180&r1=1382179&r2=1382180&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java Fri Sep  7 21:27:24 2012
@@ -20,9 +20,10 @@ package org.apache.jmeter.save;
 
 import java.io.BufferedReader;
 import java.io.CharArrayWriter;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.StringReader;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -128,7 +129,8 @@ public final class CSVSaveService {
         final boolean errorsOnly = resultCollector.isErrorLogging();
         final boolean successOnly = resultCollector.isSuccessOnlyLogging();
         try {
-            dataReader = new BufferedReader(new FileReader(filename)); // TODO Charset ?
+            dataReader = new BufferedReader(new InputStreamReader(
+                    new FileInputStream(filename), SaveService.getFileEncoding("UTF-8"))); 
             dataReader.mark(400);// Enough to read the header column names
             // Get the first line, and see if it is the header
             String line = dataReader.readLine();

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1382180&r1=1382179&r2=1382180&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Sep  7 21:27:24 2012
@@ -131,6 +131,7 @@ The original behaviour can be restored b
 <li><bugzilla>53501</bugzilla> - Synchronization timer blocks test end.</li>
 <li><bugzilla>53750</bugzilla> - TestCompiler saves unnecessary entries in pairing collection</li>
 <li><bugzilla>52266</bugzilla> - Code:Inconsistent synchronization</li>
+<li><bugzilla>53841</bugzilla> - CSVSaveService reads file using JVM default file encoding instead of using the one configured in saveservice.properties</li>
 </ul>
 
 <!-- =================== Improvements =================== -->