[jmeter] branch master updated: Calculate connectTime for parent sampler in transaction controller

[fschumacher]

This is an automated email from the ASF dual-hosted git repository.

fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
     new 06a7522  Calculate connectTime for parent sampler in transaction 
controller
06a7522 is described below

commit 06a7522d6c5de0d099bb5e8641a763b28041187d
Author: Felix Schumacher <felix.schumac...@internetallee.de>
AuthorDate: Mon Feb 24 14:36:53 2020 +0100

    Calculate connectTime for parent sampler in transaction controller
    
    Bugzulla Id: 63856
---
 .../src/main/java/org/apache/jmeter/control/TransactionSampler.java   | 4 ++++
 xdocs/changes.xml                                                     | 2 ++
 2 files changed, 6 insertions(+)

diff --git 
a/src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java 
b/src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java
index 504dfe9..b8ee999 100644
--- a/src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java
+++ b/src/core/src/main/java/org/apache/jmeter/control/TransactionSampler.java
@@ -53,6 +53,8 @@ public class TransactionSampler extends AbstractSampler {
 
     private long totalTime = 0;
 
+    private long totalConnectTime = 0;
+
     /**
      * @deprecated only for use by test code
      */
@@ -114,6 +116,7 @@ public class TransactionSampler extends AbstractSampler {
         transactionSampleResult.addSubResult(res, false);
         // Add current time to total for later use (exclude pause time)
         totalTime += res.getTime();
+        totalConnectTime += res.getConnectTime();
     }
 
     protected void setTransactionDone() {
@@ -133,6 +136,7 @@ public class TransactionSampler extends AbstractSampler {
                     - transactionSampleResult.getStartTime() - totalTime);
             transactionSampleResult.setEndTime(end);
         }
+        transactionSampleResult.setConnectTime(totalConnectTime);
     }
 
     protected void setSubSampler(Sampler subSampler) {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 4d8a389..7fa166a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -203,6 +203,7 @@ to view the last release notes of version 5.2.1.
 <ul>
   <li><bug>63945</bug>NPE when opening a file after file system change</li>
   <li><bug>64034</bug>Shell scripts fail if space in <code>JAVA_HOME</code> 
path. Contributed by ray7219 (ray7219 at hotmail.com)</li>
+  <li><bug>63856</bug>Set <code>connectTime</code> on parent samples when 
using a transaction controller</li>
 </ul>
 
  <!--  =================== Thanks =================== -->
@@ -224,6 +225,7 @@ to view the last release notes of version 5.2.1.
   <li>Michael McDermott (mcdermott.michaelj at gmail.com)</li>
   <li>yangxiaofei77 (yangxiaofei77 at gmail.com)</li>
   <li>Markus Wolf (wolfm at t-systems.com)</li>
+  <li>Pierre Astruc (pierre.astruc at evertest.com)</li>
 </ul>
 <p>
 Apologies if we have omitted anyone else.