From e19cce7317e21c7820edab75164263f9b8cf751d Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 16 May 2014 16:32:45 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 68533: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 68310: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3) 68265: MNT-11345: Merged V4.1.6 (4.1.6.15) to V4.1-BUG-FIX (4.1.9) 65696: Merged DEV to V4.1.6 (4.1.6.15) 65522: MNT-10931 : Unable to retrieve completed workflow's tasks using workflowService.queryTasks() with processProperties Added a check to NOT include start-task when the process for the given processId is already ended. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/workflow/activiti/ActivitiWorkflowEngine.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java index 98b5fa9e4a..caa4b0f877 100644 --- a/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java +++ b/source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2014 Alfresco Software Limited. * * This file is part of Alfresco * @@ -2031,8 +2031,11 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine { return false; } - - if(query.getProcessCustomProps() != null) + + // Do NOT include start-task when the process for the given processId is already ended + // See MNT-10931 + if(query.getProcessCustomProps() != null && + !WorkflowTaskState.COMPLETED.equals(workflowTask.getState())) { // Get properties for process instance, based on path of start task, which is process-instance Map props = getPathProperties(workflowTask.getPath().getId());