jsalvata 2002/12/27 17:18:07
Modified: src/components/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java
Log:
Show redirection intermediate results in Tree Visualizer. Fixes bug#15382.
Revision Changes Path
1.13 +9 -3
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Index: ViewResultsFullVisualizer.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ViewResultsFullVisualizer.java 28 Dec 2002 01:15:26 -0000 1.12
+++ ViewResultsFullVisualizer.java 28 Dec 2002 01:18:07 -0000 1.13
@@ -2,7 +2,7 @@
* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -158,6 +158,12 @@
log.debug("updateGui1 : sample result - " + res);
DefaultMutableTreeNode currNode = new DefaultMutableTreeNode(res);
treeModel.insertNodeInto(currNode, root, root.getChildCount());
+ addSubResults(currNode, res);
+ log.debug("End : updateGui1");
+ }
+
+ private void addSubResults(DefaultMutableTreeNode currNode,
+ SampleResult res) {
SampleResult[] subResults = res.getSubResults();
if (subResults != null)
{
@@ -169,9 +175,9 @@
log.debug("updateGui1 : child sample result
- " + child);
DefaultMutableTreeNode leafNode = new
DefaultMutableTreeNode(child);
treeModel.insertNodeInto(leafNode, currNode,
leafIndex++);
+ addSubResults(leafNode, child);
}
}
- log.debug("End : updateGui1");
}
/****************************************
* Clears the visualizer
1.18 +8 -5
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Index: HTTPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- HTTPSampler.java 27 Dec 2002 15:51:18 -0000 1.17
+++ HTTPSampler.java 28 Dec 2002 01:18:07 -0000 1.18
@@ -936,10 +936,13 @@
}
else
{
- redirectUrl(conn, u);
time = System.currentTimeMillis() - time;
- res = sample(redirects+1);
- time += res.getTime();
+
+ HTTPSampler redirect=
(HTTPSampler)this.clone();
+ redirect.redirectUrl(conn, u);
+ SampleResult redirectResult=
redirect.sample(redirects+1);
+ res.addSubResult(redirectResult);
+ time += redirectResult.getTime();
}
}
else
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
