fe_timeout.rb in ruote-0.9.20

- old
+ new

@@ -1,45 +1,29 @@
-#
 #--
-# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
+# Copyright (c) 2007-2009, John Mettraux, jmettraux@gmail.com
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
-# $Id: definitions.rb 2725 2006-06-02 13:26:32Z jmettraux $
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'openwfe/expressions/timeout'
 
 
 module OpenWFE
@@ -65,29 +49,26 @@
 
     attr_accessor :applied_workitem
 
     def apply (workitem)
 
-      if @children.size < 1
-        reply_to_parent workitem
-        return
-      end
+      return reply_to_parent(workitem) if has_no_expression_child
 
       @applied_workitem = workitem.dup
 
-      schedule_timeout :after
+      schedule_timeout(workitem, :after)
 
-      get_expression_pool.apply @children[0], workitem
+      apply_child(first_expression_child, workitem)
     end
 
     #
     # The child expression replies, make sure to unschedule the timeout
     # before replying (to our own parent expression).
     #
     def reply (workitem)
 
-      unschedule_timeout
+      unschedule_timeout(workitem)
 
       super
     end
 
     #
@@ -96,27 +77,30 @@
     #
     def cancel
 
       get_expression_pool.cancel(@children[0]) if @applied_workitem
 
-      unschedule_timeout
+      unschedule_timeout(nil)
 
-      super
+      trigger_on_cancel # if any
+
+      #super
+      @applied_workitem
     end
 
     #
     # The timeout trigger, cancels the nested process segment (the
     # nested expression).
     #
     def trigger (scheduler)
 
       ldebug { "trigger() timeout requested for #{@fei.to_debug_s}" }
 
-      set_timedout_flag @applied_workitem
+      set_timedout_flag(@applied_workitem)
 
       cancel
 
-      reply_to_parent @applied_workitem
+      reply_to_parent(@applied_workitem)
     end
   end
 
 end
 