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 2006/05/16 22:04:29 UTC
svn commit: r407043 -
/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java
Author: sebb
Date: Tue May 16 13:04:29 2006
New Revision: 407043
URL: http://svn.apache.org/viewcvs?rev=407043&view=rev
Log:
Use pop-up dialog instead of error sample
Allow for CSV header line
Modified:
jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java
Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=407043&r1=407042&r2=407043&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/reporters/ResultCollector.java Tue May 16 13:04:29 2006
@@ -44,6 +44,7 @@
import org.apache.avalon.framework.configuration.DefaultConfigurationSerializer;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.engine.util.NoThreadClone;
+import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.samplers.Remoteable;
import org.apache.jmeter.samplers.SampleEvent;
@@ -180,7 +181,7 @@
*
*/
public void loadExistingFile() {
- boolean parsedOK = false;
+ boolean parsedOK = false, errorDetected = false;
String filename = getFilename();
File file = new File(filename);
if (file.exists()) {
@@ -196,7 +197,13 @@
} else {
if (!line.startsWith("<?xml ")){// No, must be CSV //$NON-NLS-1$
while (line != null) { // Already read 1st line
- sendToVisualizer(OldSaveService.makeResultFromDelimitedString(line));
+ // TODO parse the header line if there is one
+ try {
+ SampleResult result = OldSaveService.makeResultFromDelimitedString(line);
+ if (result != null) sendToVisualizer(result);
+ } catch (NumberFormatException ignored){
+ errorDetected = true;
+ }
line = dataReader.readLine();
}
parsedOK = true;
@@ -226,10 +233,10 @@
} finally {
JOrphanUtils.closeQuietly(dataReader);
JOrphanUtils.closeQuietly(bufferedInputStream);
- if (!parsedOK) {
- SampleResult sr = new SampleResult();
- sr.setSampleLabel("Error loading results file - see log file");
- sendToVisualizer(sr);
+ if (!parsedOK || errorDetected) {
+ GuiPackage.showErrorMessage(
+ "Error loading results file - see log file",
+ "CSV Result file loader");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org