Author: milamber
Date: Mon Mar 28 22:18:47 2011
New Revision: 1086424
URL: http://svn.apache.org/viewvc?rev=1086424&view=rev
Log:
Bug 50977 - Unable to set TCP Sampler for individual samples
Modified:
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java?rev=1086424&r1=1086423&r2=1086424&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
Mon Mar 28 22:18:47 2011
@@ -27,6 +27,7 @@ import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketAddress;
+import java.net.SocketException;
import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map;
@@ -145,28 +146,33 @@ public class TCPSampler extends Abstract
con = (Socket) cp.get(TCPKEY);
if (con != null) {
log.debug(this + " Reusing connection " + con); //$NON-NLS-1$
- return con;
}
}
-
- // Not in cache, so create new one and cache it
+ if (con == null) {
+ // Not in cache, so create new one and cache it
+ try {
+ closeSocket(); // Bug 44910 - close previous socket (if any)
+ SocketAddress sockaddr = new InetSocketAddress(getServer(),
getPort());
+ con = new Socket();
+ con.connect(sockaddr, getConnectTimeout());
+ log.debug("Created new connection " + con); //$NON-NLS-1$
+ cp.put(TCPKEY, con);
+ } catch (UnknownHostException e) {
+ log.warn("Unknown host for " + getLabel(), e);//$NON-NLS-1$
+ cp.put(ERRKEY, e.toString());
+ } catch (IOException e) {
+ log.warn("Could not create socket for " + getLabel(), e);
//$NON-NLS-1$
+ cp.put(ERRKEY, e.toString());
+ }
+ }
+ // (re-)Define connection params - Bug 50977
try {
- closeSocket(); // Bug 44910 - close previous socket (if any)
- SocketAddress sockaddr = new InetSocketAddress(getServer(),
getPort());
- con = new Socket();
- con.connect(sockaddr, getConnectTimeout());
con.setSoTimeout(getTimeout());
con.setTcpNoDelay(getNoDelay());
-
log.debug(this + " Timeout " + getTimeout() + " NoDelay " +
getNoDelay()); //$NON-NLS-1$
- log.debug("Created new connection " + con); //$NON-NLS-1$
- cp.put(TCPKEY, con);
- } catch (UnknownHostException e) {
- log.warn("Unknown host for " + getLabel(), e);//$NON-NLS-1$
- cp.put(ERRKEY, e.toString());
- } catch (IOException e) {
- log.warn("Could not create socket for " + getLabel(), e);
//$NON-NLS-1$
- cp.put(ERRKEY, e.toString());
+ } catch (SocketException se) {
+ log.warn("Could not set timeout or nodelay for " + getLabel(),
se); //$NON-NLS-1$
+ cp.put(ERRKEY, se.toString());
}
return con;
}
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1086424&r1=1086423&r2=1086424&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Mar 28 22:18:47 2011
@@ -89,6 +89,7 @@ This is internal to the workings of the
<ul>
<li>Bug 50173 - JDBCSampler discards ResultSet from a PreparedStatement</li>
<li>Ensure JSR223 Sampler has access to the current SampleResult</li>
+<li>Bug 50977 - Unable to set TCP Sampler for individual samples</li>
</ul>
<h3>Controllers</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
