Author: pmouawad
Date: Sat Mar 17 21:41:10 2012
New Revision: 1302018
URL: http://svn.apache.org/viewvc?rev=1302018&view=rev
Log:
Bug 52916 - JDBC Exception if there is an empty user defined variable
Modified:
jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=1302018&r1=1302017&r2=1302018&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java Sat
Mar 17 21:41:10 2012
@@ -45,6 +45,7 @@ import javax.swing.JTable;
import javax.swing.ListSelectionModel;
import javax.swing.table.TableCellEditor;
+import org.apache.commons.lang.StringUtils;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
@@ -218,6 +219,9 @@ public class ArgumentsPanel extends Abst
Iterator<Argument> modelData = (Iterator<Argument>)
tableModel.iterator();
while (modelData.hasNext()) {
Argument arg = modelData.next();
+ if(StringUtils.isEmpty(arg.getName()) &&
StringUtils.isEmpty(arg.getValue())) {
+ continue;
+ }
arg.setMetaData("="); // $NON-NLS-1$
arguments.addArgument(arg);
}
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1302018&r1=1302017&r2=1302018&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Mar 17 21:41:10 2012
@@ -63,6 +63,11 @@ or a Debug Sampler with all fields set t
When doing replacement of User Defined Variables, Proxy will not substitute
partial values anymore when "Regexp matching" is used. It will use Perl 5 word
matching ("\b")
</p>
+<p>
+In User Defined Variables, Test Plan, HTTP Sampler Arguments Table, Java
Request Defaults, JMS Sampler and Publisher, LDAP Request Defaults and LDAP
Extended Request Defaults, rows with
+empty Name and Value are no more saved.
+</p>
+
<!-- =================== Bug fixes =================== -->
<h2>Bug fixes</h2>
@@ -84,6 +89,7 @@ When doing replacement of User Defined V
<li>Bug 52868 - BSF language list should be sorted</li>
<li>Bug 52869 - JSR223 language list currently uses BSF list which is
wrong</li>
<li>Bug 52932 - JDBC Sampler : Sampler is not marked in error in an Exception
which is not of class IOException, SQLException, IOException occurs</li>
+<li>Bug 52916 - JDBC Exception if there is an empty user defined variable</li>
</ul>
<h3>Controllers</h3>
