You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2020/12/06 10:36:49 UTC
[jmeter] 04/04: When importing XML formatted jtl files,
sub samplers will get renamed
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
commit a568c86405b3473e428ddd192c19a3495858b7bc
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Dec 6 11:35:09 2020 +0100
When importing XML formatted jtl files, sub samplers will get renamed
Bugzilla Id: 64821
---
src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java | 4 ++--
.../java/org/apache/jmeter/save/converters/SampleResultConverter.java | 2 +-
xdocs/changes.xml | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
index 11902de..a8eb891 100644
--- a/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
+++ b/src/core/src/main/java/org/apache/jmeter/samplers/SampleResult.java
@@ -706,11 +706,11 @@ public class SampleResult implements Serializable, Cloneable, Searchable {
* the {@link SampleResult} to be added
* @param renameSubResults boolean do we rename subResults based on position
*/
- private void storeSubResult(SampleResult subResult, boolean renameSubResults) {
+ public void storeSubResult(SampleResult subResult, boolean renameSubResults) {
if (subResults == null) {
subResults = new ArrayList<>();
}
- if(renameSubResults) {
+ if (renameSubResults) {
subResult.setSampleLabel(getSampleLabel()+"-"+subResultIndex++);
}
subResults.add(subResult);
diff --git a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java
index 49cbb09..857bb3f 100644
--- a/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java
+++ b/src/core/src/main/java/org/apache/jmeter/save/converters/SampleResultConverter.java
@@ -396,7 +396,7 @@ public class SampleResultConverter extends AbstractCollectionConverter {
if (subItem instanceof AssertionResult) {
res.addAssertionResult((AssertionResult) subItem);
} else if (subItem instanceof SampleResult) {
- res.storeSubResult((SampleResult) subItem);
+ res.storeSubResult((SampleResult) subItem, false);
} else if (nodeName.equals(TAG_RESPONSE_HEADER)) {
res.setResponseHeaders((String) subItem);
} else if (nodeName.equals(TAG_REQUEST_HEADER)) {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 13e7d06..1d8990a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -135,6 +135,7 @@ Summary
<h3>Listeners</h3>
<ul>
+ <li><bug>64821</bug>When importing XML formatted jtl files, sub samplers will get renamed</li>
</ul>
<h3>Timers, Assertions, Config, Pre- & Post-Processors</h3>