From 00f537132d64fe973dbfd4561e3ebcc85cfcaba7 Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Sat, 22 Sep 2007 00:52:24 +0000 Subject: [PATCH] Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from XML files too git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/trunk@578339 13f79535-47bb-0310-9956-ffa450edef68 Former-commit-id: dad0225dd80b259c8ad5b3c7acda0f5f1353b77e --- .../apache/jmeter/save/converters/SampleResultConverter.java | 5 +++++ xdocs/changes.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java b/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java index f04092a7d9..dcdcd7f6cc 100644 --- a/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java +++ b/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java @@ -77,6 +77,7 @@ public class SampleResultConverter extends AbstractCollectionConverter { private static final String ATT_RESPONSE_CODE_OLD = "rs"; //$NON-NLS-1$ private static final String ATT_SUCCESS = "s"; //$NON-NLS-1$ + private static final String ATT_SAMPLE_COUNT = "sc"; //$NON-NLS-1$ private static final String ATT_TIME = "t"; //$NON-NLS-1$ private static final String ATT_TIME_STAMP = "ts"; //$NON-NLS-1$ private static final String ATT_THREADNAME = "tn"; //$NON-NLS-1$ @@ -247,6 +248,9 @@ public class SampleResultConverter extends AbstractCollectionConverter { writer.addAttribute(ATT_DATA_ENCODING, ConversionHelp.encode(res.getDataEncoding())); if (save.saveBytes()) writer.addAttribute(ATT_BYTES, String.valueOf(res.getBytes())); + if (save.saveSampleCount()){ + writer.addAttribute(ATT_SAMPLE_COUNT, String.valueOf(res.getSampleCount())); + } if (save.saveThreadCounts()){ writer.addAttribute(ATT_GRP_THRDS, String.valueOf(res.getGroupThreads())); writer.addAttribute(ATT_ALL_THRDS, String.valueOf(res.getAllThreads())); @@ -348,6 +352,7 @@ public class SampleResultConverter extends AbstractCollectionConverter { Converter.getLong(reader.getAttribute(ATT_TIME))); res.setLatency(Converter.getLong(reader.getAttribute(ATT_LATENCY))); res.setBytes(Converter.getInt(reader.getAttribute(ATT_BYTES))); + res.setSampleCount(Converter.getInt(reader.getAttribute(ATT_SAMPLE_COUNT),1)); // default is 1 res.setGroupThreads(Converter.getInt(reader.getAttribute(ATT_GRP_THRDS))); res.setAllThreads(Converter.getInt(reader.getAttribute(ATT_ALL_THRDS))); } diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 1258f73e4a..6c9bf143a1 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -58,7 +58,7 @@
  • Fixup broken jmeter-server script
  • Bug 43364 - option to revert If Controller to pre 2.3RC3 behaviour
  • Bug 43449 - Statistical Remote mode does not handle Latency
    • -
  • Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from CSV files
    • +
  • Bug 43450 (partial fix) - Allow SampleCount to be saved/restored from files

    • Improvements