mstover1 2002/06/24 17:45:15
Modified: src_1/org/apache/jmeter/control RandomController.java
src_1/org/apache/jmeter/gui/action Load.java
Log:
Fixing loading bug and random controller problem
Revision Changes Path
1.2 +1 -6
jakarta-jmeter/src_1/org/apache/jmeter/control/RandomController.java
Index: RandomController.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/control/RandomController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RandomController.java 19 Jun 2002 20:36:08 -0000 1.1
+++ RandomController.java 25 Jun 2002 00:45:14 -0000 1.2
@@ -65,7 +65,7 @@
* Window>Preferences>Java>Templates.
*/
public class RandomController
- extends GenericController
+ extends InterleaveControl
implements Serializable
{
Random rand;
@@ -73,11 +73,6 @@
public RandomController()
{
rand = new Random();
- }
-
- public void initialize()
- {
- super.initialize();
}
protected void resetCurrent()
1.11 +3 -4 jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src_1/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Load.java 14 Jun 2002 00:12:33 -0000 1.10
+++ Load.java 25 Jun 2002 00:45:14 -0000 1.11
@@ -142,8 +142,7 @@
}
catch(Throwable ex)
{
- ex.printStackTrace();
- /*try
+ try
{
legacyLoad(f);
}
@@ -152,7 +151,7 @@
//ex.printStackTrace();
err.printStackTrace();
JMeterUtils.reportErrorToUser("Couldn't load JMX file.
May have been corrupted");
- }*/
+ }
}
finally
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
