weel 1.99.7 → 1.99.8

data/lib/weel.rb

@@ -241,8 +241,8 @@ class WEEL
          !@q.empty?
        end  
      end  
-     def continue
-       @q.push nil
+     def continue(what=nil)
+       @q.push what
      end
      def clear
       @q.clear
@@ -621,15 +621,13 @@ class WEEL
 
             passthrough = @__weel_search_positions[position] ? @__weel_search_positions[position].passthrough : nil
             begin
-              # with loop if catch Signal::Again
-              begin
-                # handshake call and wait until it finished
-                handlerwrapper.activity_handle passthrough, params
-                Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :stopped
-                again = false
-              rescue Signal::Again
-                again = true
-              end
+              # with loop if catching Signal::Again
+              # handshake call and wait until it finished
+
+              handlerwrapper.activity_handle passthrough, params
+              waitingresult = nil
+              waitingresult = Thread.current[:continue].wait unless Thread.current[:nolongernecessary] || self.__weel_state == :stopping || self.__weel_state == :stopped
+              raise waitingresult if !waitingresult.nil? && waitingresult.is_a?(Signal::Again)
 
               if Thread.current[:nolongernecessary]
                 handlerwrapper.activity_no_longer_necessary 
@@ -661,7 +659,7 @@ class WEEL
                   (mr.changed_endpoints.any? ? mr.changed_endpoints.uniq : nil)
                 )
               end
-            end while wp.passthrough.nil? && again
+            end while wp.passthrough.nil? && waitingresult == Signal::Again
             if wp.passthrough.nil?
               handlerwrapper.inform_activity_done
               wp.detail = :after

data/test/TestHandlerWrapper.rb

@@ -19,7 +19,7 @@ class TestHandlerWrapper < WEEL::HandlerWrapperBase
     if @__myhandler_endpoint == 'again'
       @__myhandler_returnValue = parameters.has_key?(:result) ? parameters[:result] : 'Handler_Dummy_Result'
       if parameters[:call].call 
-        raise WEEL::Signal::Again  
+        @__myhandler_continue.continue WEEL::Signal::Again  
       else
         @__myhandler_continue.continue 
       end  

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.7"
+  s.version          = "1.99.8"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of the Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.7
+  version: 1.99.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies: []
 description: see http://cpee.org
 email: juergen.mangler@gmail.com