Merged SHA-SIMP-2 (5.1.0) to HEAD (5.1)

113487 ragauss: ACE-4268: Added Users' Activiti Tasks Remain Active After Invitation Accepted
     - Removed user task step from add-direct workflow
     - Added check for completed start task in InvitationServiceImpl to avoid error throwing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@113854 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ahmed Owian
2015-10-07 20:10:40 +00:00
parent fab1a86082
commit a1a53bc3de
2 changed files with 5 additions and 22 deletions

View File

@@ -1525,7 +1525,10 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
logger.debug("Transitioning Invite workflow task...");
try
{
workflowService.endTask(startTask.getId(), null);
if (startTask != null && startTask.getState() != WorkflowTaskState.COMPLETED)
{
workflowService.endTask(startTask.getId(), null);
}
}
catch (RuntimeException err)
{