You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/02/13 16:00:34 UTC
svn commit: r1730226 - in
/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http:
config/gui/ gui/ modifier/ parser/ proxy/gui/ sampler/
Author: pmouawad
Date: Sat Feb 13 15:00:33 2016
New Revision: 1730226
URL: http://svn.apache.org/viewvc?rev=1730226&view=rev
Log:
Used foreach where possible.
Patch by Graham Russell Part 5
https://github.com/apache/jmeter/pull/114
#resolve #114
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java Sat Feb 13 15:00:33 2016
@@ -50,7 +50,7 @@ import org.apache.jmeter.protocol.http.s
import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.JLabeledChoice;
@@ -270,12 +270,11 @@ public class UrlConfigGui extends JPanel
*/
private static String computePostBody(Arguments arguments, boolean crlfToLF) {
StringBuilder postBody = new StringBuilder();
- PropertyIterator args = arguments.iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ for (JMeterProperty argument : arguments) {
+ HTTPArgument arg = (HTTPArgument) argument.getObjectValue();
String value = arg.getValue();
if (crlfToLF) {
- value=value.replaceAll("\r\n", "\n"); // See modifyTestElement
+ value = value.replaceAll("\r\n", "\n"); // See modifyTestElement
}
postBody.append(value);
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java Sat Feb 13 15:00:33 2016
@@ -33,7 +33,7 @@ import org.apache.jmeter.config.Argument
import org.apache.jmeter.config.gui.ArgumentsPanel;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.ObjectTableModel;
@@ -130,9 +130,8 @@ public class HTTPArgumentsPanel extends
if (el instanceof Arguments) {
tableModel.clearData();
HTTPArgument.convertArgumentsToHTTP((Arguments) el);
- PropertyIterator iter = ((Arguments) el).getArguments().iterator();
- while (iter.hasNext()) {
- HTTPArgument arg = (HTTPArgument) iter.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : ((Arguments) el).getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
tableModel.addRow(arg);
}
}
@@ -189,14 +188,14 @@ public class HTTPArgumentsPanel extends
*/
private void transformNameIntoVariable() {
int[] rowsSelected = getTable().getSelectedRows();
- for (int i = 0; i < rowsSelected.length; i++) {
- String name = (String) tableModel.getValueAt(rowsSelected[i], 0);
- if(StringUtils.isNotBlank(name)) {
+ for (int selectedRow : rowsSelected) {
+ String name = (String) tableModel.getValueAt(selectedRow, 0);
+ if (StringUtils.isNotBlank(name)) {
name = name.trim();
name = name.replaceAll("\\$", "_");
name = name.replaceAll("\\{", "_");
name = name.replaceAll("\\}", "_");
- tableModel.setValueAt("${"+name+"}", rowsSelected[i], 1);
+ tableModel.setValueAt("${" + name + "}", selectedRow, 1);
}
}
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java Sat Feb 13 15:00:33 2016
@@ -37,6 +37,7 @@ import org.apache.jmeter.protocol.http.u
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jorphan.logging.LoggingManager;
@@ -96,9 +97,8 @@ public class AnchorModifier extends Abst
sampler.setDomain(url.getDomain());
sampler.setPath(url.getPath());
if (url.getMethod().equals(HTTPConstants.POST)) {
- PropertyIterator iter = sampler.getArguments().iterator();
- while (iter.hasNext()) {
- Argument arg = (Argument) iter.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : sampler.getArguments()) {
+ Argument arg = (Argument) jMeterProperty.getObjectValue();
modifyArgument(arg, url.getArguments());
}
} else {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/RegExUserParameters.java Sat Feb 13 15:00:33 2016
@@ -27,7 +27,7 @@ import org.apache.jmeter.processor.PrePr
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -72,9 +72,8 @@ public class RegExUserParameters extends
}
HTTPSamplerBase sampler = (HTTPSamplerBase) entry;
- PropertyIterator iter = sampler.getArguments().iterator();
- while (iter.hasNext()) {
- Argument arg = (Argument) iter.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : sampler.getArguments()) {
+ Argument arg = (Argument) jMeterProperty.getObjectValue();
String oldValue = arg.getValue();
// if parameter name exists in http request
// then change its value with value obtained with regular expression
@@ -82,8 +81,8 @@ public class RegExUserParameters extends
if (val != null) {
arg.setValue(val);
}
- if (log.isDebugEnabled()){
- log.debug("RegExUserParameters element:"+getName()+" => changed parameter: "+arg.getName() +" = "+ arg.getValue()+", was:"+oldValue);
+ if (log.isDebugEnabled()) {
+ log.debug("RegExUserParameters element:" + getName() + " => changed parameter: " + arg.getName() + " = " + arg.getValue() + ", was:" + oldValue);
}
}
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java Sat Feb 13 15:00:33 2016
@@ -31,7 +31,7 @@ import org.apache.jmeter.config.Argument
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
import org.apache.jmeter.protocol.http.util.ConversionUtils;
-import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -104,9 +104,8 @@ public final class HtmlParsingUtils {
return false;
}
- PropertyIterator iter = arguments.iterator();
- while (iter.hasNext()) {
- Argument item = (Argument) iter.next().getObjectValue();
+ for (JMeterProperty argument : arguments) {
+ Argument item = (Argument) argument.getObjectValue();
final String name = item.getName();
if (!query.contains(name + "=")) { // $NON-NLS-1$
if (!(matcher.contains(query, patternCache.getPattern(name, Perl5Compiler.READ_ONLY_MASK)))) {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java Sat Feb 13 15:00:33 2016
@@ -289,8 +289,8 @@ public class ProxyControlGui extends Log
private List<String> getDataList(PowerTableModel pModel, String colName) {
String[] dataArray = pModel.getData().getColumn(colName);
List<String> list = new LinkedList<>();
- for (int i = 0; i < dataArray.length; i++) {
- list.add(dataArray[i]);
+ for (String data : dataArray) {
+ list.add(data);
}
return list;
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AjpSampler.java Sat Feb 13 15:00:33 2016
@@ -280,10 +280,8 @@ public class AjpSampler extends HTTPSamp
setString(HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED);
StringBuilder sb = new StringBuilder();
boolean first = true;
- PropertyIterator args = getArguments().iterator();
- while(args.hasNext()) {
- JMeterProperty arg = args.next();
- if(first) {
+ for (JMeterProperty arg : getArguments()) {
+ if (first) {
first = false;
} else {
sb.append('&');
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC3Impl.java Sat Feb 13 15:00:33 2016
@@ -754,11 +754,10 @@ public class HTTPHC3Impl extends HTTPHCA
List<PartBase> partlist = new ArrayList<>();
// Create the parts
// Add any parameters
- PropertyIterator args = getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
String parameterName = arg.getName();
- if (arg.isSkippable(parameterName)){
+ if (arg.isSkippable(parameterName)) {
continue;
}
StringPart part = new StringPart(arg.getName(), arg.getValue(), contentEncoding);
@@ -881,11 +880,10 @@ public class HTTPHC3Impl extends HTTPHCA
// Just append all the parameter values, and use that as the post body
StringBuilder postBody = new StringBuilder();
- PropertyIterator args = getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
String value;
- if (haveContentEncoding){
+ if (haveContentEncoding) {
value = arg.getEncodedValue(contentEncoding);
} else {
value = arg.getEncodedValue();
@@ -903,24 +901,23 @@ public class HTTPHC3Impl extends HTTPHCA
post.setRequestHeader(HTTPConstants.HEADER_CONTENT_TYPE, HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED);
}
// Add the parameters
- PropertyIterator args = getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
// The HTTPClient always urlencodes both name and value,
// so if the argument is already encoded, we have to decode
// it before adding it to the post request
String parameterName = arg.getName();
- if (arg.isSkippable(parameterName)){
+ if (arg.isSkippable(parameterName)) {
continue;
}
String parameterValue = arg.getValue();
- if(!arg.isAlwaysEncoded()) {
+ if (!arg.isAlwaysEncoded()) {
// The value is already encoded by the user
// Must decode the value now, so that when the
// httpclient encodes it, we end up with the same value
// as the user had entered.
String urlContentEncoding = contentEncoding;
- if(urlContentEncoding == null || urlContentEncoding.length() == 0) {
+ if (urlContentEncoding == null || urlContentEncoding.length() == 0) {
// Use the default encoding for urls
urlContentEncoding = EncoderCache.URL_ARGUMENT_ENCODING;
}
@@ -1009,11 +1006,10 @@ public class HTTPHC3Impl extends HTTPHCA
// Just append all the parameter values, and use that as the post body
StringBuilder putBodyContent = new StringBuilder();
- PropertyIterator args = getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
String value = null;
- if (haveContentEncoding){
+ if (haveContentEncoding) {
value = arg.getEncodedValue(contentEncoding);
} else {
value = arg.getEncodedValue();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java Sat Feb 13 15:00:33 2016
@@ -1088,16 +1088,15 @@ public class HTTPHC4Impl extends HTTPHCA
null, charset);
// Create the parts
// Add any parameters
- PropertyIterator args = getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
- String parameterName = arg.getName();
- if (arg.isSkippable(parameterName)){
- continue;
- }
- StringBody stringBody = new StringBody(arg.getValue(), charset);
- FormBodyPart formPart = new FormBodyPart(arg.getName(), stringBody);
- multiPart.addPart(formPart);
+ for (JMeterProperty jMeterProperty : getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
+ String parameterName = arg.getName();
+ if (arg.isSkippable(parameterName)) {
+ continue;
+ }
+ StringBody stringBody = new StringBody(arg.getValue(), charset);
+ FormBodyPart formPart = new FormBodyPart(arg.getName(), stringBody);
+ multiPart.addPart(formPart);
}
// Add any files
@@ -1191,12 +1190,11 @@ public class HTTPHC4Impl extends HTTPHCA
// Just append all the parameter values, and use that as the post body
StringBuilder postBody = new StringBuilder();
- PropertyIterator args = getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
// Note: if "Encoded?" is not selected, arg.getEncodedValue is equivalent to arg.getValue
if (haveContentEncoding) {
- postBody.append(arg.getEncodedValue(contentEncoding));
+ postBody.append(arg.getEncodedValue(contentEncoding));
} else {
postBody.append(arg.getEncodedValue());
}
@@ -1321,12 +1319,11 @@ public class HTTPHC4Impl extends HTTPHCA
// Just append all the parameter values, and use that as the entity body
StringBuilder entityBodyContent = new StringBuilder();
- PropertyIterator args = getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
// Note: if "Encoded?" is not selected, arg.getEncodedValue is equivalent to arg.getValue
- if (charset!= null) {
- entityBodyContent.append(arg.getEncodedValue(charset));
+ if (charset != null) {
+ entityBodyContent.append(arg.getEncodedValue(charset));
} else {
entityBodyContent.append(arg.getEncodedValue());
}
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java Sat Feb 13 15:00:33 2016
@@ -32,7 +32,7 @@ import org.apache.jmeter.protocol.http.u
import org.apache.jmeter.protocol.http.util.HTTPConstants;
import org.apache.jmeter.protocol.http.util.HTTPFileArg;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jorphan.util.JOrphanUtils;
/**
@@ -191,11 +191,10 @@ public class PostWriter {
// First the multipart start divider
bos.write(getMultipartDivider());
// Add any parameters
- PropertyIterator args = sampler.getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : sampler.getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
String parameterName = arg.getName();
- if (arg.isSkippable(parameterName)){
+ if (arg.isSkippable(parameterName)) {
continue;
}
// End the previous multipart
@@ -307,9 +306,8 @@ public class PostWriter {
// Just append all the parameter values, and use that as the post body
StringBuilder postBodyBuffer = new StringBuilder();
- PropertyIterator args = sampler.getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
+ for (JMeterProperty jMeterProperty : sampler.getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
postBodyBuffer.append(arg.getEncodedValue(contentEncoding));
}
postBody = postBodyBuffer.toString();
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java?rev=1730226&r1=1730225&r2=1730226&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PutWriter.java Sat Feb 13 15:00:33 2016
@@ -26,7 +26,7 @@ import java.net.URLConnection;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.apache.jmeter.protocol.http.util.HTTPConstants;
import org.apache.jmeter.protocol.http.util.HTTPFileArg;
-import org.apache.jmeter.testelement.property.PropertyIterator;
+import org.apache.jmeter.testelement.property.JMeterProperty;
/**
* Class for setting the necessary headers for a PUT request, and sending the
@@ -88,11 +88,10 @@ public class PutWriter extends PostWrite
// Just append all the parameter values, and use that as the put body
StringBuilder putBodyBuffer = new StringBuilder();
- PropertyIterator args = sampler.getArguments().iterator();
- while (args.hasNext()) {
- HTTPArgument arg = (HTTPArgument) args.next().getObjectValue();
- putBodyBuffer.append(arg.getEncodedValue(contentEncoding));
- }
+ for (JMeterProperty jMeterProperty : sampler.getArguments()) {
+ HTTPArgument arg = (HTTPArgument) jMeterProperty.getObjectValue();
+ putBodyBuffer.append(arg.getEncodedValue(contentEncoding));
+ }
bos.write(putBodyBuffer.toString().getBytes(contentEncoding));
bos.flush();