Author: sebb
Date: Sat Jul  5 10:54:17 2008
New Revision: 674215

URL: http://svn.apache.org/viewvc?rev=674215&view=rev
Log:
Bug 45185 - CSV dataset blank delimiter causes OOM

Modified:
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
    jakarta/jmeter/trunk/xdocs/changes.xml

Modified: 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java?rev=674215&r1=674214&r2=674215&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java 
(original)
+++ 
jakarta/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java 
Sat Jul  5 10:54:17 2008
@@ -126,6 +126,9 @@
                        String delim = getDelimiter();
                        if (delim.equals("\\t")) { // $NON-NLS-1$
                                delim = "\t";// Make it easier to enter a Tab 
// $NON-NLS-1$
+                   } else if (delim.length()==0){
+                       log.warn("Empty delimiter converted to ','");
+                       delim=",";
                    }
                        // TODO: fetch this once as per vars above?
             JMeterVariables threadVars = context.getVariables();

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=674215&r1=674214&r2=674215&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Jul  5 10:54:17 2008
@@ -80,6 +80,7 @@
 <li>The test element "Save Results to a file" is now shown as a Listener</li>
 <li>Amend TestBeans to show the correct popup menu for Listeners</li>
 <li>Fix NPE when using nested Transaction Controllers with parent samples</li>
+<li>Bug 45185 - CSV dataset blank delimiter causes OOM</li>
 </ul>
 
 <h3>Improvements</h3>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to