lib/openwfe/expressions/fe_concurrence.rb in openwferu-0.9.7 vs lib/openwfe/expressions/fe_concurrence.rb in openwferu-0.9.8

- old
+ new

@@ -382,11 +382,11 @@ s = synchable_expression.lookup_attribute(:count, workitem) return -1 if not s i = s.to_i return -1 if i < 1 - return i + i end # # This inner class is used to gather workitems before the final # merge, which is triggered by calling the do_merge() method @@ -465,11 +465,11 @@ #puts "___ result :" #puts result.to_s #puts - return result + result end protected def first? @@ -507,20 +507,20 @@ return wiSource unless wiTarget return wiTarget unless wiSource return wiSource if override? - wiSource.attributes.each do | k, v | + wiSource.attributes.each do |k, v| #puts "merge() '#{k}' => '#{v}'" nk = OpenWFE::fulldup(k) nv = OpenWFE::fulldup(v) wiTarget.attributes[nk] = nv end - return wiTarget + wiTarget end end end