From 8c777dbb9456291e673d7f88bef616bb16fa5fc7 Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Thu, 14 Dec 2006 16:16:27 +0000 Subject: [PATCH] Merged V1.4 to HEAD svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4214 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4215 . Workflow fixes required on HEAD git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4610 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/workflow/WorkflowServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java index 66860e7412..4b9f38f747 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java @@ -225,11 +225,13 @@ public class WorkflowServiceImpl implements WorkflowService */ public WorkflowInstance cancelWorkflow(String workflowId) { - WorkflowInstance instance = getWorkflowById(workflowId); - workflowPackageComponent.deletePackage(instance.workflowPackage); String engineId = BPMEngineRegistry.getEngineId(workflowId); WorkflowComponent component = getWorkflowComponent(engineId); - return component.cancelWorkflow(workflowId); + WorkflowInstance instance = component.cancelWorkflow(workflowId); + // NOTE: Delete workflow package after cancelling workflow, so it's still available + // in process-end events of workflow definition + workflowPackageComponent.deletePackage(instance.workflowPackage); + return instance; } /* (non-Javadoc)