From commits-return-10435-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Wed Feb 19 20:17:00 2020 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by minotaur.apache.org (Postfix) with SMTP id BBB0C19397 for ; Wed, 19 Feb 2020 20:16:59 +0000 (UTC) Received: (qmail 62817 invoked by uid 500); 19 Feb 2020 20:16:59 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 62801 invoked by uid 500); 19 Feb 2020 20:16:59 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 62792 invoked by uid 99); 19 Feb 2020 20:16:59 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Feb 2020 20:16:59 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 162D38DACA; Wed, 19 Feb 2020 20:16:59 +0000 (UTC) Date: Wed, 19 Feb 2020 20:16:59 +0000 To: "commits@jmeter.apache.org" Subject: [jmeter] branch master updated: Bug 64160 - Test HTTP/S Test Script Recorder: Name transaction controller/ simple controller using prefix without "-XXXX" suffix MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <158214341899.15266.6576382218473352744@gitbox.apache.org> From: pmouawad@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: jmeter X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 9cc24d4231b0b6c0e7cdfadda894decfcea778a2 X-Git-Newrev: aa7bc98e936f3cd7164c2611f27140b68ba623e1 X-Git-Rev: aa7bc98e936f3cd7164c2611f27140b68ba623e1 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 }