From dc08849f708b8912a2e1e4ed1762fb50fa45523b Mon Sep 17 00:00:00 2001
From: "Paula V. Quispe" <paula.quispe@colosa.com>
Date: Fri, 1 Apr 2016 15:04:46 -0400
Subject: [PATCH] HOR-666

HOR-666:conflicts
---
 workflow/engine/classes/class.derivation.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php
index f9a93d504..2f41ba6df 100755
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -724,31 +724,31 @@ class Derivation
                 $elementDestType
             );
 
-            if($elementDestUid == "-1" || count($arrayElement) == 0){
+            if($elementDestUid === '-1' || count($arrayElement) === 0 || $elementDestType === 'bpmnEvent'){
                $arrayElement = $this->throwElementToEnd($elementOriginUid, $rouCondition);
             }
 
             foreach ($arrayElement as $value) {
                 switch ($value[1]) {
-                    case "bpmnEvent":
+                    case 'bpmnEvent':
                         if ($arrayEventExecute[$positionEventExecute]) {
                             $event = \BpmnEventPeer::retrieveByPK($value[0]);
 
                             if (!is_null($event)) {
-                                if (preg_match("/^(?:END|INTERMEDIATE)$/", $event->getEvnType()) && $event->getEvnMarker() == "MESSAGETHROW") {
+                                if (preg_match("/^(?:END|INTERMEDIATE)$/", $event->getEvnType()) && $event->getEvnMarker() === 'MESSAGETHROW') {
                                     //Message-Application throw
                                     $result = $messageApplication->create($arrayApplicationData["APP_UID"], $arrayApplicationData["PRO_UID"], $value[0], $arrayApplicationData);
                                 }
 
-                                if (preg_match("/^(?:END|INTERMEDIATE)$/", $event->getEvnType()) && $event->getEvnMarker() == "EMAIL") {
+                                if (preg_match("/^(?:END|INTERMEDIATE)$/", $event->getEvnType()) && $event->getEvnMarker() === 'EMAIL') {
                                     //Email-Event throw
                                     $result = $emailEvent->sendEmail($arrayApplicationData["APP_UID"], $arrayApplicationData["PRO_UID"], $value[0], $arrayApplicationData);
                                 }
                             }
                         }
                         break;
-                    case "bpmnGateway":
-                        $positionEventExecute = "AFTER";
+                    case 'bpmnGateway':
+                        $positionEventExecute = 'AFTER';
                         break;
                 }
             }