From 6fd14d098700c2db111c7ed8b7ada231c51f6cf4 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 14 Mar 2014 15:53:19 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 63096: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3) 63043: Revert the reverse to merge the reverse from V4.1-BF instead 62900: Reverse merge from V4.2-BUG-FIX (4.2.2) to V4.1-BUG-FIX (4.1.8) 62851: Reverse merged << Caused build error https://bamboo.alfresco.com/bamboo/browse/ALF-ENTERPRISEV42BUGFIX-194 >> 62778: MNT-10122: Related to MNT-2234 - Incorrect workflow history when using jBPM. In JBPMEngine.getTaskProperties() for ContentModel.PROP_OWNER set curren user. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@64269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java index 24d5c160f2..ba68fe0d4a 100644 --- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java +++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java @@ -2933,7 +2933,7 @@ public class JBPMEngine extends AlfrescoBpmEngine implements WorkflowEngine properties.put(WorkflowModel.PROP_COMPLETION_DATE, instance.getEnd()); properties.put(WorkflowModel.PROP_PRIORITY, instance.getPriority()); properties.put(ContentModel.PROP_CREATED, instance.getCreate()); - properties.put(ContentModel.PROP_OWNER, instance.getActorId()); + properties.put(ContentModel.PROP_OWNER, AuthenticationUtil.getFullyAuthenticatedUser()); // map jBPM comments // NOTE: Only use first comment in list