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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Alan Davis 2014-05-16 16:32:45 +00:00
parent a41642494b
commit e19cce7317
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/workflow/activiti/ActivitiWorkflowEngine.java
View File

@ -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<QName, Serializable> props = getPathProperties(workflowTask.getPath().getId());