svn commit: r1719579 - /jmeter/trunk/src/core/org/apache/jmeter/report/core/CsvSampleReader.java

[pm...@apache.org]

Author: pmouawad
Date: Fri Dec 11 22:17:03 2015
New Revision: 1719579

URL: http://svn.apache.org/viewvc?rev=1719579&view=rev
Log:
Fix issue reported by sebb
Use property as default

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=1719579&r1=1719578&r2=1719579&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 Fri Dec 11 22:17:03 2015
@@ -30,6 +30,7 @@ import org.apache.jmeter.samplers.Sample
 //import org.apache.jmeter.samplers.SampleResult;
 //import org.apache.jmeter.samplers.SampleSaveConfiguration;
 import org.apache.jmeter.save.CSVSaveService;
+import org.apache.jmeter.util.JMeterUtils;
 import org.apache.jorphan.util.JOrphanUtils;
 
 /**
@@ -46,6 +47,9 @@ public class CsvSampleReader implements
 
     private static final String CHARSET = "ISO8859-1";
 
+    private static final char DEFAULT_SEPARATOR =
+	    JMeterUtils.getPropDefault("jmeter.save.saveservice.default_delimiter", ",").charAt(0); //$NON-NLS-1$ //$NON-NLS-2$
+
     private File file;
 
     private BufferedReader reader;
@@ -84,16 +88,16 @@ public class CsvSampleReader implements
      *            the metadata
      */
     public CsvSampleReader(File inputFile, SampleMetadata metadata) {
-        this(inputFile, metadata, null, false);
+        this(inputFile, metadata, DEFAULT_SEPARATOR, false);
     }
 
     private CsvSampleReader(File inputFile, SampleMetadata metadata,
-            Character separator, boolean useSaveSampleCfg) {
+            char separator, boolean useSaveSampleCfg) {
         if (inputFile == null) {
             throw new ArgumentNullException("inputFile");
         }
 
-        if (inputFile.isFile() == false || inputFile.canRead() == false) {
+        if (!(inputFile.isFile() && inputFile.canRead())) {
             throw new IllegalArgumentException(inputFile.getAbsolutePath()
                     + "does not exist or is not readable");
         }