cpee 1.3.138 → 1.3.139

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d48178530a9f9c1885a88d46053086ae0cf9eed
-  data.tar.gz: 75e0da4973eb3d5b7db31e52859e5df70850c813
+  metadata.gz: 712a194c3eec6ee8913bb4bf33b20cfc1e0438f2
+  data.tar.gz: 6d32ef50969d7fbc81121e96e56eff1d9e511e9d
 SHA512:
-  metadata.gz: 620e2cd33e1179c9affa8830f0854d74d796e170df7612361156a3d62d1900e79b3e14ab3cec58146581482d4a0e5c3015223a3d3d868dd1969aaa65f89f21a5
-  data.tar.gz: 61a3fed144b5e8d248d9296491d44aa317673ece5a2c2db43e1738cb0bbde67ee45570880e26c2bd91200424a5379492b04991f625d54acf0961fbbf84f5b9b1
+  metadata.gz: 1257fc8db4c74a8cd13275d807f97c3ab5192237585433db1d268904d08a2e603ec3a3f90bf9dd050e93ad3110931e206489b12adeee606b27754b8e1338501e
+  data.tar.gz: bdd186239b884d98d7eafc1e4b348a6d262d956631c0f6de87daf90eac0d9afc0466c210a6e6a41dc64fb06d5eb0061da27c35a1f46e7894f4f3608b0f52e74e

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.3.138"
+  s.version          = "1.3.139"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/lib/cpee/processtransformation/bpmn2.rb

@@ -182,7 +182,7 @@ module CPEE
             traces.uniq!
             debug_print debug, traces
             if node = traces.same_first
-              if branch.condition?
+              if branch.condition? && branch.empty?
                 li = @graph.link(branch.id,traces.first_node.id)
                 unless li.nil?
                   branch.condition << li.condition unless li.condition.nil?
@@ -238,10 +238,11 @@ module CPEE
               endnode = traces.find_endnode || enode
               tracesgroup, endnode = traces.segment_by endnode
               tracesgroup.each do |trcs|
+                nb = branch.last.new_branch
                 if trcs.finished?
-                  build_ttree branch.last.new_branch, Traces.new([[Break.new(1)]]), endnode, debug
+                  build_ttree nb, Traces.new([[Break.new(1)]]), endnode, debug
                 else  
-                  build_ttree branch.last.new_branch, trcs, endnode, debug
+                  build_ttree nb, trcs, endnode, debug
                 end  
                 endnode.incoming -= 1 unless endnode.nil?
               end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.3.138
+  version: 1.3.139
 platform: ruby
 authors:
 - Juergen eTM Mangler