You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2005/06/05 02:11:56 UTC
cvs commit: jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util HTTPResultConverter.java
sebb 2005/06/04 17:11:56
Modified: src/core/org/apache/jmeter/save OldSaveService.java
src/core/org/apache/jmeter/save/converters
SampleResultConverter.java
src/core/org/apache/jmeter/samplers
SampleSaveConfiguration.java
src/protocol/http/org/apache/jmeter/protocol/http/util
HTTPResultConverter.java
Log:
Save SamplerData if saving response data in functional or error modes
Revision Changes Path
1.8 +3 -3 jakarta-jmeter/src/core/org/apache/jmeter/save/OldSaveService.java
Index: OldSaveService.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/OldSaveService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- OldSaveService.java 16 May 2005 21:46:25 -0000 1.7
+++ OldSaveService.java 5 Jun 2005 00:11:56 -0000 1.8
@@ -449,7 +449,7 @@
AssertionResult[] assResults = result.getAssertionResults();
- if (saveConfig.saveSamplerData())
+ if (saveConfig.saveSamplerData(result))
{
config.addChild(
createConfigForString("samplerData", result.getSamplerData()));
1.7 +3 -3 jakarta-jmeter/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
Index: SampleResultConverter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SampleResultConverter.java 14 May 2005 23:38:19 -0000 1.6
+++ SampleResultConverter.java 5 Jun 2005 00:11:56 -0000 1.7
@@ -42,7 +42,7 @@
*/
public class SampleResultConverter extends AbstractCollectionConverter
{
- private static Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggingManager.getLoggerForClass();
/**
* Returns the converter version; used to check for possible
@@ -92,7 +92,7 @@
protected void saveSamplerData(HierarchicalStreamWriter writer,
SampleResult res, SampleSaveConfiguration save)
{
- if (save.saveSamplerData())
+ if (save.saveSamplerData(res))
{
writeString(writer, "samplerData", res.getSamplerData());
}
1.7 +3 -2 jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
Index: SampleSaveConfiguration.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SampleSaveConfiguration.java 4 Jun 2005 23:17:04 -0000 1.6
+++ SampleSaveConfiguration.java 5 Jun 2005 00:11:56 -0000 1.7
@@ -498,10 +498,11 @@
/**
* @return Returns whether to save the samplerData.
*/
- public boolean saveSamplerData()
+ public boolean saveSamplerData(SampleResult res)
{
return samplerData
- || TestPlan.getFunctionalMode(); // as per 2.0 branch
+ || TestPlan.getFunctionalMode() // as per 2.0 branch
+ || (responseDataOnError && !res.isSuccessful());
}
/**
1.2 +1 -1 jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
Index: HTTPResultConverter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTTPResultConverter.java 20 Sep 2004 23:08:40 -0000 1.1
+++ HTTPResultConverter.java 5 Jun 2005 00:11:56 -0000 1.2
@@ -78,7 +78,7 @@
MarshallingContext context, HTTPSampleResult res,
SampleSaveConfiguration save)
{
- if (save.saveSamplerData())
+ if (save.saveSamplerData(res))
{
writeString(writer, "cookies", res.getCookies());
writeString(writer, "method", res.getHTTPMethod());
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org