Author: pmouawad
Date: Mon Oct 31 06:10:52 2011
New Revision: 1195344
URL: http://svn.apache.org/viewvc?rev=1195344&view=rev
Log:
Bug 51733 - SyncTimer is messed up if you a interrupt a test plan
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java?rev=1195344&r1=1195343&r2=1195344&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
(original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
Mon Oct 31 06:10:52 2011
@@ -20,8 +20,10 @@ package org.apache.jmeter.timers;
import java.io.Serializable;
+import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -32,7 +34,7 @@ import org.apache.log.Logger;
* thus create large instant loads at various points of the test plan.
*
*/
-public class SyncTimer extends AbstractTestElement implements Timer,
Serializable, TestBean {
+public class SyncTimer extends AbstractTestElement implements Timer,
Serializable, TestBean,TestListener {
private static final long serialVersionUID = 2;
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -105,4 +107,38 @@ public class SyncTimer extends AbstractT
return newTimer;
}
-}
+ /**
+ * {@inheritDoc}
+ */
+ public void testEnded() {
+ this.testEnded(null);
+ }
+
+ /**
+ * Reset timerCounter
+ */
+ public void testEnded(String host) {
+ this.timerCounter[0] = 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void testIterationStart(LoopIterationEvent event) {
+ // NOOP
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void testStarted() {
+ testStarted(null);
+ }
+
+ /**
+ * Reset timerCounter
+ */
+ public void testStarted(String host) {
+ this.timerCounter[0] = 0;
+ }
+}
\ No newline at end of file
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1195344&r1=1195343&r2=1195344&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Oct 31 06:10:52 2011
@@ -136,6 +136,7 @@ these occurs, Sampler is marked as faile
<li>Bug 27112 - User Parameters should use scrollbars</li>
<li>Bug 52029 - Command-line shutdown only gets sent to last engine that was
started</li>
<li>Bug 52093 - Toolbar ToolTips don't switch language</li>
+<li>Bug 51733 - SyncTimer is messed up if you a interrupt a test plan</li>
</ul>
<!-- =================== Improvements =================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
