When importing XML formatted jtl files, sub samplers will get renamed

Bugzilla Id: 64821
apache · Dec 6, 2020 · a568c86 · a568c86
1 parent 6701514
commit a568c86
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 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
@@ -706,11 +706,11 @@ public void storeSubResult(SampleResult subResult) {
      *            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
@@ -396,7 +396,7 @@ protected boolean retrieveItem(HierarchicalStreamReader reader, UnmarshallingCon
         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
@@ -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- &amp; Post-Processors</h3>
-Original file line number
+Diff line change
@@ Expand Up / @@ -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- &amp; Post-Processors</h3>
@@ Expand Down @@