Author: sebb
Date: Fri Sep 28 06:01:32 2007
New Revision: 580336
URL: http://svn.apache.org/viewvc?rev=580336&view=rev
Log:
Check for out != null once
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=580336&r1=580335&r2=580336&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Fri Sep 28 06:01:32 2007
@@ -400,23 +400,19 @@
if (!isErrorLogging() || !result.isSuccessful()) {
sendToVisualizer(result);
-
- SampleSaveConfiguration config = getSaveConfig();
- result.setSaveConfig(config);
-
- try {
- if (!config.saveAsXml()) {
- if (out != null) {
+ if ( out != null) {// no point otherwise
+ SampleSaveConfiguration config =
getSaveConfig();
+ result.setSaveConfig(config);
+ try {
+ if (config.saveAsXml()) {
+ recordResult(result);
+ } else {
String savee =
OldSaveService.resultToDelimitedString(result);
out.println(savee);
}
+ } catch (Exception err) {
+ log.error("Error trying to record a
sample", err); // should throw exception back to caller
}
- // Save results as XML
- else {
- recordResult(result);
- }
- } catch (Exception err) {
- log.error("", err); // should throw exception
back to caller
}
}
}
@@ -427,16 +423,15 @@
}
}
+ // Only called if out != null
private void recordResult(SampleResult result) throws Exception {
- if (out != null) {
- if (!isResultMarked(result) && !this.isStats) {
- if (SaveService.isSaveTestLogFormat20()) {
- if (serializer == null)
- serializer = new
DefaultConfigurationSerializer();
-
out.write(getSerializedSampleResult(result));
- } else {
- SaveService.saveSampleResult(result,
out);
- }
+ if (!isResultMarked(result) && !this.isStats) {
+ if (SaveService.isSaveTestLogFormat20()) {
+ if (serializer == null)
+ serializer = new
DefaultConfigurationSerializer();
+ out.write(getSerializedSampleResult(result));
+ } else {
+ SaveService.saveSampleResult(result, out);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
