Author: sebb
Date: Wed Nov  5 08:55:29 2008
New Revision: 711614

URL: http://svn.apache.org/viewvc?rev=711614&view=rev
Log:
TCP sampler now calls setupTest() and teardownTest() methods

Modified:
    
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java
    
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/TCPClient.java
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java?rev=711614&r1=711613&r2=711614&view=diff
==============================================================================
--- 
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java
 (original)
+++ 
jakarta/jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java
 Wed Nov  5 08:55:29 2008
@@ -31,8 +31,15 @@
  * Interface required by TCPSampler for TCPClient implementations.
  */
 public interface TCPClient {
+    
+    /**
+     * Versions of JMeter after 2.3.2 invoke this method when the thread 
starts.
+     */
     void setupTest();
 
+    /**
+     * Versions of JMeter after 2.3.2 invoke this method when the thread ends.
+     */
     void teardownTest();
 
     /**

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=711614&r1=711613&r2=711614&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
 Wed Nov  5 08:55:29 2008
@@ -368,6 +368,9 @@
         protocolHandler = getProtocol();
         log.debug("Using Protocol Handler: " +  //$NON-NLS-1$
                 (protocolHandler == null ? "NONE" : 
protocolHandler.getClass().getName())); //$NON-NLS-1$
+        if (protocolHandler != null){
+            protocolHandler.setupTest();
+        }
 }
 
     private void closeSocket() {
@@ -386,5 +389,8 @@
     public void threadFinished() {
         log.debug("Thread Finished"); //$NON-NLS-1$
         closeSocket();
+        if (protocolHandler != null){
+            protocolHandler.teardownTest();
+        }
     }
 }

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=711614&r1=711613&r2=711614&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Nov  5 08:55:29 2008
@@ -145,6 +145,7 @@
 <li>CSVSaveService - check for EOF while reading quoted string</li>
 <li>Bug 46142 - JMS Receiver now uses MessageID</li>
 <li>Bug 46148 - HTTP sampler fails on SSL requests when logging for 
jmeter.util is set to DEBUG</li>
+<li>TCP sampler now calls setupTest() and teardownTest() methods</li>
 </ul>
 
 <h3>Improvements</h3>



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to