Author: sebb
Date: Fri Jun 13 18:26:17 2008
New Revision: 667717
URL: http://svn.apache.org/viewvc?rev=667717&view=rev
Log:
Bug 45199 - don't try to replace blank variables
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=667717&r1=667716&r2=667717&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Fri Jun 13 18:26:17 2008
@@ -24,6 +24,7 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import org.apache.jmeter.assertions.ResponseAssertion;
import org.apache.jmeter.assertions.gui.AssertionGui;
@@ -869,7 +870,14 @@
// Build the replacer from all the variables in the collection:
ValueReplacer replacer = new ValueReplacer();
for (Iterator vars = variables.iterator(); vars.hasNext();) {
- replacer.addVariables(((Arguments)
vars.next()).getArgumentsAsMap());
+ final Map map = ((Arguments) vars.next()).getArgumentsAsMap();
+ for (Iterator vals = map.values().iterator(); vals.hasNext();){
+ final Object next = vals.next();
+ if ("".equals(next)) {// Drop any empty values (Bug 45199)
+ vals.remove();
+ }
+ }
+ replacer.addVariables(map);
}
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
