Author: sebb
Date: Tue Nov 20 09:21:44 2007
New Revision: 596745
URL: http://svn.apache.org/viewvc?rev=596745&view=rev
Log:
Fix HTTP (Java) sampler so http.java.sampler.retries means retries, i.e. does
not include initial try
Modified:
jakarta/jmeter/trunk/bin/jmeter.properties
jakarta/jmeter/trunk/docs/changes.html
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.properties?rev=596745&r1=596744&r2=596745&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/jmeter.properties (original)
+++ jakarta/jmeter/trunk/bin/jmeter.properties Tue Nov 20 09:21:44 2007
@@ -196,6 +196,7 @@
# Number of connection retries performed by HTTP Java sampler before giving up
#http.java.sampler.retries=10
+# 0 now means don't retry connection (in 2.3 and before it meant no tries at
all!)
#---------------------------------------------------------------------------
# HTTPClient configuration
@@ -207,6 +208,7 @@
# set the socket timeout (or use the parameter http.socket.timeout)
#httpclient.timeout=0
+# 0 == no timeout
# Set the http version (defaults to 1.1)
#httpclient.version=1.0 (or use the parameter http.protocol.version)
Modified: jakarta/jmeter/trunk/docs/changes.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/changes.html?rev=596745&r1=596744&r2=596745&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/changes.html (original)
+++ jakarta/jmeter/trunk/docs/changes.html Tue Nov 20 09:21:44 2007
@@ -363,6 +363,11 @@
</li>
+
<li >
+ Fix HTTP (Java)
sampler so http.java.sampler.retries means retries, i.e. does not include
initial try
+ </li>
+
+
</ul>
<h4 >
Improvements
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java?rev=596745&r1=596744&r2=596745&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Tue Nov 20 09:21:44 2007
@@ -432,7 +432,8 @@
// Sampling proper - establish the connection and read
the response:
// Repeatedly try to connect:
int retry;
- for (retry = 1; retry <= MAX_CONN_RETRIES; retry++) {
+ // Start with 0 so tries at least once, and retries at
most MAX_CONN_RETRIES times
+ for (retry = 0; retry <= MAX_CONN_RETRIES; retry++) {
try {
conn = setupConnection(url, method,
res);
// Attempt the connection:
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=596745&r1=596744&r2=596745&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Nov 20 09:21:44 2007
@@ -152,6 +152,7 @@
<li>Default HTTPSampleResult to ISO-8859-1 encoding</li>
<li>Fix default encoding for blank encoding</li>
<li>Fix Https spoofing (port problem) which was broken in 2.3</li>
+<li>Fix HTTP (Java) sampler so http.java.sampler.retries means retries, i.e.
does not include initial try</li>
</ul>
<h4>Improvements</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
