[jmeter] branch master updated: Bug 64160 - Test HTTP/S Test Script Recorder: Name transaction controller/ simple controller using prefix without "-XXXX" suffix

[pmouawad]

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

pmouawad 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 aa7bc98  Bug 64160 - Test HTTP/S Test Script Recorder: Name 
transaction controller/ simple controller using prefix without "-XXXX" suffix
aa7bc98 is described below

commit aa7bc98e936f3cd7164c2611f27140b68ba623e1
Author: pmouawad <p.moua...@ubik-ingenierie.com>
AuthorDate: Wed Feb 19 21:16:39 2020 +0100

    Bug 64160 - Test HTTP/S Test Script Recorder: Name transaction
    controller/ simple controller using prefix without "-XXXX" suffix
---
 .../java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
 
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index c5dd967..99df08e 100644
--- 
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++ 
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -45,6 +45,7 @@ import java.util.prefs.Preferences;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.apache.http.conn.ssl.AbstractVerifier;
 import org.apache.jmeter.assertions.Assertion;
@@ -1133,14 +1134,16 @@ public class ProxyControl extends GenericController 
implements NonTestElement {
             long deltaT = now - lastTime;
             int cachedGroupingMode = groupingMode;
             if (deltaT > sampleGap) {
+                String controllerName = 
StringUtils.isNotEmpty(getPrefixHTTPSampleName()) ?
+                        getPrefixHTTPSampleName() : sampler.getName();
                 if (!myTarget.isLeaf() && cachedGroupingMode == 
GROUPING_ADD_SEPARATORS) {
                     addDivider(treeModel, myTarget);
                 }
                 if (cachedGroupingMode == GROUPING_IN_SIMPLE_CONTROLLERS) {
-                    addSimpleController(treeModel, myTarget, 
sampler.getName());
+                    addSimpleController(treeModel, myTarget, controllerName);
                 }
                 if (cachedGroupingMode == GROUPING_IN_TRANSACTION_CONTROLLERS) 
{
-                    addTransactionController(treeModel, myTarget, 
sampler.getName());
+                    addTransactionController(treeModel, myTarget, 
controllerName);
                 }
                 firstInBatch = true;// Remember this was first in its batch
             }