weel 1.99.115 → 1.99.116

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f20fd5f7b32a6434668eeaaa8045d5c0296572bef72e2f5c379463db03f2920
-  data.tar.gz: 19f0d8bec594c5dbcd7c1d320ff48f57e79576cf9a0ce49ddd8831941fdcf300
+  metadata.gz: 4179daff04f9e6d8e955eeec5538cd100673aeb2941c8445a88639d321f828b2
+  data.tar.gz: 5fe7cde1bf8ab2bed9e6a0a6a71e9ee19910a118e9ea00bbd99efcd88ffcf40f
 SHA512:
-  metadata.gz: aa1b2e8be0012e82d0357898e6d1e393899c4b1e1fca9351d9e129cb0bad2098d4e9455aa7167f7692b4befcdb8b413fb57b89f7a1bbc7fa07518667340d5dc9
-  data.tar.gz: b3f2448a93b65276467bf1cf7e4317313063bbd36e7658d84d3668e924b629812b4172d674b67d7a22fd49e412b3106d68c2289ffefcc7f0b1110de5e24f568a
+  metadata.gz: 95bda8281dd834bc7d2f1dcb63b135f162b4ddf45847c22de8835d091fc2d920ec7a6104849be59447b379d22bbd71e230610cbe22f751cc6a50a0ebb7d5008e
+  data.tar.gz: 9b06b7677afe6f1449c6fd8dfcd64de06607d36d659e80c9c8a016652a0cfac66533ee760245fa39e1b2726b50a83e000483fb9ed846a19744f758a2f225c4d1

data/lib/weel.rb

@@ -525,7 +525,7 @@ class WEEL
       unless self.__weel_state == :stopping || self.__weel_state == :finishing || self.__weel_state == :stopped
         # first set all to no_longer_neccessary
         Thread.current[:branches].each do |thread|
-          if thread.alive?
+          if thread.alive? && thread[:branch_wait_count_cancel_active] == false
             thread[:nolongernecessary] = true
             __weel_recursive_continue(thread)
           end
@@ -971,6 +971,7 @@ class WEEL
           wp.detail = :unmark
         end
       rescue Signal::NoLongerNecessary
+        connectionwrapper.inform_activity_done
         @__weel_positions.delete wp
         Thread.current[:branch_position] = nil
         wp.passthrough = nil
@@ -991,13 +992,13 @@ class WEEL
         if Thread.current[:branch_parent]
           Thread.current[:branch_parent][:mutex].synchronize do
             if Thread.current[:branch_parent][:branch_wait_count_cancel_condition] == :first
-              if !Thread.current[:branch_wait_count_cancel_active]
+              if !Thread.current[:branch_wait_count_cancel_active] && Thread.current[:branch_parent][:branch_wait_count_cancel] <  Thread.current[:branch_parent][:branch_wait_count]
                 Thread.current[:branch_wait_count_cancel_active] = true
                 Thread.current[:branch_parent][:branch_wait_count_cancel] += 1
               end
               if Thread.current[:branch_parent][:branch_wait_count_cancel] ==  Thread.current[:branch_parent][:branch_wait_count]  && self.__weel_state != :stopping && self.__weel_state != :finishing
                 Thread.current[:branch_parent][:branches].each do |thread|
-                  if thread.alive? && thread != Thread.current
+                  if thread.alive? && thread[:branch_wait_count_cancel_active] == false
                     thread[:nolongernecessary] = true
                     __weel_recursive_continue(thread)
                   end

data/weel.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "weel"
-  s.version          = "1.99.115"
+  s.version          = "1.99.116"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Workflow Execution Engine Library (WEEL)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weel
 version: !ruby/object:Gem::Version
-  version: 1.99.115
+  version: 1.99.116
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-11 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit