You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@commons.apache.org by wo...@apache.org on 2013/11/28 07:46:24 UTC

svn commit: r1546299 - /commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java

Author: woonsan
Date: Thu Nov 28 06:46:24 2013
New Revision: 1546299

URL: http://svn.apache.org/r1546299
Log:
SCXML-167: remove timer first to avoid some corner cases (e.g, removing other timer by unexpected non-unique sendid)

Modified:
    commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java

Modified: commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java?rev=1546299&r1=1546298&r2=1546299&view=diff
==============================================================================
--- commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java (original)
+++ commons/proper/scxml/trunk/src/main/java/org/apache/commons/scxml2/env/SimpleScheduler.java Thu Nov 28 06:46:24 2013
@@ -233,13 +233,13 @@ public class SimpleScheduler implements 
          */
         @Override
         public void run() {
+            timers.remove(sendId);
             try {
                 executor.triggerEvent(new TriggerEvent(event,
                     TriggerEvent.SIGNAL_EVENT, payload));
             } catch (ModelException me) {
                 log.error(me.getMessage(), me);
             }
-            timers.remove(sendId);
             if (log.isDebugEnabled()) {
                 log.debug("Fired event '" + event + "' as scheduled by "
                     + "<send> with id '" + sendId + "'");