inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issue with activiti history in 5.11 (ACT-1512)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@45072 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Frederik Heremans
2013-01-04 09:52:54 +00:00
parent ba0afdd13f
commit 2ec915b7b3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/workflow/activiti/properties/ActivitiPropertyConverter.java
View File

@@ -38,7 +38,6 @@ import org.activiti.engine.history.HistoricDetailQuery;
import org.activiti.engine.history.HistoricProcessInstance; import org.activiti.engine.history.HistoricProcessInstance;
import org.activiti.engine.history.HistoricTaskInstance; import org.activiti.engine.history.HistoricTaskInstance;
import org.activiti.engine.history.HistoricVariableUpdate; import org.activiti.engine.history.HistoricVariableUpdate;
import org.activiti.engine.impl.persistence.entity.HistoricDetailVariableInstanceUpdateEntity;
import org.activiti.engine.impl.persistence.entity.TaskEntity; import org.activiti.engine.impl.persistence.entity.TaskEntity;
import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition; import org.activiti.engine.impl.pvm.ReadOnlyProcessDefinition;
import org.activiti.engine.repository.ProcessDefinition; import org.activiti.engine.repository.ProcessDefinition;
@@ -786,6 +785,7 @@ public class ActivitiPropertyConverter
Map<String, Object> variablesToSet = handlerRegistry.handleVariablesToSet(properties, type, task, Task.class); Map<String, Object> variablesToSet = handlerRegistry.handleVariablesToSet(properties, type, task, Task.class);
TaskService taskService = activitiUtil.getTaskService(); TaskService taskService = activitiUtil.getTaskService();
// Will be set when an assignee is present in passed properties. // Will be set when an assignee is present in passed properties.
taskService.saveTask(task); taskService.saveTask(task);
@@ -863,7 +863,7 @@ public class ActivitiPropertyConverter
Map<String, Object> variables = new HashMap<String, Object>(); Map<String, Object> variables = new HashMap<String, Object>();
for(HistoricDetail detail : details) for(HistoricDetail detail : details)
{ {
HistoricDetailVariableInstanceUpdateEntity varUpdate = (HistoricDetailVariableInstanceUpdateEntity) detail; HistoricVariableUpdate varUpdate = (HistoricVariableUpdate) detail;
// First value for a single key is used // First value for a single key is used
if(!variables.containsKey(varUpdate.getVariableName())) if(!variables.containsKey(varUpdate.getVariableName()))
{ {