mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
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
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user