svn commit: r1719521 - /jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java

[fschumacher]

Author: fschumacher
Date: Fri Dec 11 20:06:04 2015
New Revision: 1719521

URL: http://svn.apache.org/viewvc?rev=1719521&view=rev
Log:
listFiles() can return null, so guard against that case.

Modified:
    
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java?rev=1719521&r1=1719520&r2=1719521&view=diff
==============================================================================
--- 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
 (original)
+++ 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/CsvFileSampleSource.java
 Fri Dec 11 20:06:04 2015
@@ -115,6 +115,9 @@ public class CsvFileSampleSource extends
             throw new SampleException("Could not locate input sample files !",
                     e);
         }
+        if (secondaryInputs == null) {
+            secondaryInputs = new File[0];
+        }
         inputFiles = new File[secondaryInputs.length + 1];
         csvReaders = new CsvSampleReader[secondaryInputs.length + 1];
         int k = 0;