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

57637: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57624: Merged V4.1-BUG-FIX (4.1.8) to V4.2-BUG-FIX (4.2.1)
         57607: Merged V4.1.7 (4.1.7) to V4.1-BUG-FIX (4.1.8)
            57604: MNT-9695: Merged V4.1.6 (4.1.6.1) to V4.1.7 (4.1.7)
               57589:  MNT-9828: CLONE - When a site is deleted, pending invites are still seen by users and connot be accepted/rejected/cleaned by the users
                  - The actioned upon node reference (actionedUponNodeRef) parameter for "cancel-workflow" action was changed to null (not node based action).


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61861 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 21:18:42 +00:00
parent 6829e52375
commit 381a8ea850

View File

@@ -1608,7 +1608,7 @@ public class InvitationServiceImpl implements InvitationService, NodeServicePoli
action.setParameterValue(CancelWorkflowActionExecuter.PARAM_WORKFLOW_ID_LIST, (Serializable)invitationIds);
// Cancel the workflows asynchronously - see ALF-11872 (svn rev 32936 for details on why this is asynchronous).
actionService.executeAction(action, siteRef, false, true); // FIXME Here's the fix - make the steRef null
actionService.executeAction(action, null, false, true);
if (logger.isDebugEnabled())
{