mstover1 2003/06/05 08:02:06
Modified: src/core/org/apache/jmeter/gui/action CheckDirty.java
Save.java
src/core/org/apache/jmeter/util JMeterUtils.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy
HttpRequestHdr.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java
Log:
Fixing the way redirects happen
fixing checking if test plan changed since last save
Revision Changes Path
1.8 +1 -0
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/CheckDirty.java
Index: CheckDirty.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/CheckDirty.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CheckDirty.java 1 May 2003 19:47:17 -0000 1.7
+++ CheckDirty.java 5 Jun 2003 15:02:06 -0000 1.8
@@ -107,6 +107,7 @@
*/
public void addNode(Object node,HashTree subTree)
{
+ log.debug("Node is class:" + node.getClass());
JMeterGUIComponent treeNode = (JMeterGUIComponent)node;
if(checkMode)
{
1.11 +1 -1 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java
Index: Save.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Save.java 1 May 2003 19:47:17 -0000 1.10
+++ Save.java 5 Jun 2003 15:02:06 -0000 1.11
@@ -163,7 +163,7 @@
chosenFile = testPlanFile;
}
- ActionRouter.getInstance().actionPerformed(new
ActionEvent(subTree,e.getID(),CheckDirty.SUB_TREE_SAVED));
+ ActionRouter.getInstance().actionPerformed(new
ActionEvent(subTree.clone(),e.getID(),CheckDirty.SUB_TREE_SAVED));
try
{
convertSubTree(subTree);
1.24 +3 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- JMeterUtils.java 5 Jun 2003 00:13:40 -0000 1.23
+++ JMeterUtils.java 5 Jun 2003 15:02:06 -0000 1.24
@@ -97,7 +97,7 @@
*/
public class JMeterUtils implements UnitTestManager
{
- private static final String VERSION="1.9.RC20030604";
+ private static final String VERSION="1.9.RC20030605";
private static PatternCacheLRU patternCache = new PatternCacheLRU(1000,new
Perl5Compiler());
transient private static Logger log =
@@ -977,6 +977,7 @@
return VERSION;
}
}
+
1.12 +5 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
Index: HttpRequestHdr.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- HttpRequestHdr.java 1 Jun 2003 20:02:07 -0000 1.11
+++ HttpRequestHdr.java 5 Jun 2003 15:02:06 -0000 1.12
@@ -91,6 +91,7 @@
dataLength =
Math.max(parseLine(line.toString()), dataLength);
}
+ //log.debug("Client Request Line: " + line.toString());
line.reset();
}
else if (!inHeaders)
@@ -98,6 +99,7 @@
readLength++;
}
}
+ log.debug("Client Request Line: " + line.toString());
postData = line.toString().trim();
return clientRequest.toByteArray();
}
1.41 +6 -8
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.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- HTTPSampler.java 8 May 2003 21:14:09 -0000 1.40
+++ HTTPSampler.java 5 Jun 2003 15:02:06 -0000 1.41
@@ -968,13 +968,11 @@
}
else
{
- time = System.currentTimeMillis() - time;
-
- HTTPSampler redirect = (HTTPSampler) this.clone();
- redirect.redirectUrl(conn, u);
- SampleResult redirectResult = redirect.sample(redirects + 1);
+ time =
bundleResponseInResult(time,res,conn);//System.currentTimeMillis() - time;
+ redirectUrl(conn, u);
+ SampleResult redirectResult = sample(redirects + 1);
res.addSubResult(redirectResult);
- res.setResponseData(redirectResult.getResponseData());
+ //res.setResponseData(redirectResult.getResponseData());
res.setSuccessful(redirectResult.isSuccessful());
time += redirectResult.getTime();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
