Improve getting workflow context data when running nested workflows

ezecosystem · Jun 2, 2017 · cbab279 · cbab279
1 parent 4cd1e5b
commit cbab279
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Core/WorkflowServiceInner.php b/Core/WorkflowServiceInner.php
@@ -109,13 +109,14 @@ public function executeMigration(MigrationDefinition $migrationDefinition, $useT
     protected function executeMigrationInner(Migration $migration, MigrationDefinition $migrationDefinition,
         $migrationContext, $stepOffset = 0, $useTransaction = true, $adminLogin = null)
     {
+        $previousWorkflowName = $this->currentWorkflowName;
         $this->currentWorkflowName = $migration->name;
         try {
             parent::executeMigrationInner($migration, $migrationDefinition, $migrationContext, $stepOffset,
                 $useTransaction, $adminLogin);
-            $this->currentWorkflowName = null;
+            $this->currentWorkflowName = $previousWorkflowName;
         } catch (\Exception $e) {
-            $this->currentWorkflowName = null;
+            $this->currentWorkflowName = $previousWorkflowName;
             throw $e;
         }
     }