inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V1.4 to HEAD

Browse Source 
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
This commit is contained in:
Derek Hulley
2006-12-14 16:16:27 +00:00
parent 9a5df4b303
commit 8c777dbb94
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java
View File

@@ -225,11 +225,13 @@ public class WorkflowServiceImpl implements WorkflowService
*/ */
public WorkflowInstance cancelWorkflow(String workflowId) public WorkflowInstance cancelWorkflow(String workflowId)
{ {
WorkflowInstance instance = getWorkflowById(workflowId);
workflowPackageComponent.deletePackage(instance.workflowPackage);
String engineId = BPMEngineRegistry.getEngineId(workflowId); String engineId = BPMEngineRegistry.getEngineId(workflowId);
WorkflowComponent component = getWorkflowComponent(engineId); 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) /* (non-Javadoc)