mstover1 01/04/10 10:31:01
Modified: src/org/apache/jmeter/save/handlers
AbstractConfigElementHandler.java
ArgumentsHandler.java
src/org/apache/jmeter/threads JMeterThread.java
Log:
Fixing bugs to do with a test having no more samples, saving bugs.
Revision Changes Path
1.5 +3 -3
jakarta-jmeter/src/org/apache/jmeter/save/handlers/AbstractConfigElementHandler.java
Index: AbstractConfigElementHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/save/handlers/AbstractConfigElementHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractConfigElementHandler.java 2001/03/24 14:39:58 1.4
+++ AbstractConfigElementHandler.java 2001/04/10 17:31:00 1.5
@@ -120,7 +120,7 @@
if(data != null && data.trim().length() > 0)
{
- config.putProperty(currentProperty,data);
+ config.putProperty(currentProperty,data.trim());
currentProperty = null;
}
}
@@ -172,8 +172,8 @@
{
out.write("<property name=\"");
out.write(key);
- out.write("\">\n");
+ out.write("\">");
JMeterHandler.writeObject(value,out);
- out.write("\n</property>\n");
+ out.write("</property>\n");
}
}
1.4 +4 -0
jakarta-jmeter/src/org/apache/jmeter/save/handlers/ArgumentsHandler.java
Index: ArgumentsHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/save/handlers/ArgumentsHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ArgumentsHandler.java 2001/03/17 22:25:56 1.3
+++ ArgumentsHandler.java 2001/04/10 17:31:00 1.4
@@ -125,6 +125,10 @@
public void argument(String data)
{
+ if(data != null)
+ {
+ data = data.trim();
+ }
args.addArgument(currentArgument,data);
currentArgument = null;
}
1.11 +3 -2 jakarta-jmeter/src/org/apache/jmeter/threads/JMeterThread.java
Index: JMeterThread.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/org/apache/jmeter/threads/JMeterThread.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JMeterThread.java 2001/03/17 22:25:57 1.10
+++ JMeterThread.java 2001/04/10 17:31:01 1.11
@@ -70,8 +70,8 @@
* timing, add listeners for sampling events and to stop the sampling process.
*
*@author $Author: mstover1 $
- *@created $Date: 2001/03/17 22:25:57 $
- *@version $Revision: 1.10 $
+ *@created $Date: 2001/04/10 17:31:01 $
+ *@version $Revision: 1.11 $
***********************************************************/
public class JMeterThread implements Runnable, java.io.Serializable
{
@@ -119,6 +119,7 @@
if (entry == null)
{
running = false;
+ break;
}
Sampler sampler = null;
try
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
