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

Fixed failing test caused by changes to ActivitiWorkflowEngine.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30019 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
N Smith
2011-08-24 09:56:52 +00:00
parent 47b39283e2
commit c9eda64276
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/alfresco/messages/activiti-engine-messages.properties
View File

@@ -37,7 +37,7 @@ activiti.engine.get.task.instance.error=Task instance {0} does not exist.
activiti.engine.update.task.error=Failed to update workflow task {0}. activiti.engine.update.task.error=Failed to update workflow task {0}.
activiti.engine.update.task.unexisting.error=Failed to update workflow task {0}, the task doesn't exist. activiti.engine.update.task.unexisting.error=Failed to update workflow task {0}, the task doesn't exist.
activiti.engine.update.starttask.illegal.error=Failed to update workflow task {0}, start tasks cannot be updated in activiti. activiti.engine.update.starttask.illegal.error=Failed to update workflow task {0}, start tasks cannot be updated in activiti.
activiti.engine.end.task.invalid.transition=Transition {0} is invalid for Workflow task {1}, only transition {1} is allowed. activiti.engine.end.task.invalid.transition=Transition {0} is invalid for Workflow task {1}, only transition {2} is allowed.
activiti.engine.end.task.unexisting.error=Failed to signal transition on task {0}, the task doesn't exist. activiti.engine.end.task.unexisting.error=Failed to signal transition on task {0}, the task doesn't exist.
activiti.engine.end.task.error=Failed to signal transition {0} from workflow task {1}. activiti.engine.end.task.error=Failed to signal transition {0} from workflow task {1}.
activiti.engine.get.task.by.id.error=Failed to retrieve task {0}. activiti.engine.get.task.by.id.error=Failed to retrieve task {0}.

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

@@ -1258,11 +1258,13 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
String outcomeValue = ActivitiConstants.DEFAULT_TRANSITION_NAME; String outcomeValue = ActivitiConstants.DEFAULT_TRANSITION_NAME;
HashMap<QName, Serializable> updates = new HashMap<QName, Serializable>(); HashMap<QName, Serializable> updates = new HashMap<QName, Serializable>();
boolean isDefaultTransition = transition == null || ActivitiConstants.DEFAULT_TRANSITION_NAME.equals(transition);
Map<QName, Serializable> properties = propertyConverter.getTaskProperties(task, false); Map<QName, Serializable> properties = propertyConverter.getTaskProperties(task, false);
QName outcomePropName = (QName) properties.get(WorkflowModel.PROP_OUTCOME_PROPERTY_NAME); QName outcomePropName = (QName) properties.get(WorkflowModel.PROP_OUTCOME_PROPERTY_NAME);
if(outcomePropName !=null) if(outcomePropName !=null)
{ {
if(transition != null) if(isDefaultTransition == false)
{ {
outcomeValue = transition; outcomeValue = transition;
Serializable transitionValue = propertyConverter.convertValueToPropertyType(task, transition, outcomePropName); Serializable transitionValue = propertyConverter.convertValueToPropertyType(task, transition, outcomePropName);
@@ -1277,8 +1279,7 @@ public class ActivitiWorkflowEngine extends BPMEngine implements WorkflowEngine
} }
} }
} }
else if (transition != null && else if (isDefaultTransition==false)
ActivitiConstants.DEFAULT_TRANSITION_NAME.equals(transition)==false)
{ {
// Only 'Next' is supported as transition. // Only 'Next' is supported as transition.
String taskId = createGlobalId(task.getId()); String taskId = createGlobalId(task.getId());