svn commit: r923374 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/timers/SyncTimer.java xdocs/changes.xml

Author: sebb
Date: Mon Mar 15 18:22:06 2010
New Revision: 923374

URL: http://svn.apache.org/viewvc?rev=923374&view=rev
Log:
Bug 48901 - Endless wait by adding Synchronizing Timer

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=923374&r1=923373&r2=923374&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 Mar 15 18:22:06 2010
@@ -86,7 +86,6 @@ public class SyncTimer extends AbstractT
                     log.warn(e.getLocalizedMessage());
                 }
             }
-            timerCounter[0]=0; // Reset for next time
         }
         return 0;
     }

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=923374&r1=923373&r2=923374&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Mon Mar 15 18:22:06 2010
@@ -133,6 +133,7 @@ The XPath Assertion and XPath Extractor 
 <li>Disallow adding any child elements to JDBC Configuration</li>
 <li>BeanInfoSupport now caches getBeanDescriptor() - should avoid an NPE on non-Sun JVMs when using CSVDataSet (and some other TestBeans)</li>
 <li>Bug 48350 - Deadlock on distributed testing with 2 clients</li>
+<li>Bug 48901 - Endless wait by adding Synchronizing Timer</li>
 </ul>
 
 <!-- ==================================================== -->