From 78d5d43e86926d86e5f2b678beef9b6c339c336a Mon Sep 17 00:00:00 2001
From: Derek Hulley <derek.hulley@alfresco.com>
Date: Wed, 7 Mar 2007 15:04:21 +0000
Subject: [PATCH] Merged V2.0 to HEAD    5178: WCM-336, checkin performance   
 5182: Missing OpenSearch strings    5183: AR-1126    5185: OpenSearch
 externalized strings    5190: Schema and xforms    5191: WCM-343    5205:
 NTML using incorrect auth component    5210: No virtual server start    5211:
 WCM-352, WCM-353    5212: Manage Task Dialog issues

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5332 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/workflow/jbpm/JBPMEngine.java        |  7 ++++-
 .../repo/workflow/jbpm/test_taskassign.xml    | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 source/java/org/alfresco/repo/workflow/jbpm/test_taskassign.xml

diff --git a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
index 2b090fafde..10d8e72487 100644
--- a/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
+++ b/source/java/org/alfresco/repo/workflow/jbpm/JBPMEngine.java
@@ -1501,7 +1501,12 @@ public class JBPMEngine extends BPMEngine
                     {
                         throw new WorkflowException("Task owner '" + value + "' is invalid");
                     }
-                    instance.setActorId((String)value);
+                    String actorId = (String)value;
+                    String existingActorId = instance.getActorId();
+                    if (existingActorId == null || !actorId.equals(existingActorId))
+                    {
+                        instance.setActorId((String)value);
+                    }
                     continue;
                 }
             }
diff --git a/source/java/org/alfresco/repo/workflow/jbpm/test_taskassign.xml b/source/java/org/alfresco/repo/workflow/jbpm/test_taskassign.xml
new file mode 100644
index 0000000000..0af8c39c25
--- /dev/null
+++ b/source/java/org/alfresco/repo/workflow/jbpm/test_taskassign.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-definition xmlns="urn:jbpm.org:jpdl-3.1" name="wf:testtaskassign">
+
+    <swimlane name="initiator" />
+
+    <start-state name="start">
+        <task name="bpm:startTask" swimlane="initiator" />
+        <transition name="" to="assign" />
+    </start-state>
+
+    <swimlane name="assignee">
+        <assignment class="org.alfresco.repo.workflow.jbpm.AlfrescoAssignment">
+           <actor>#{bpm_assignee}</actor>
+        </assignment>
+    </swimlane>
+
+    <task-node name="assign">
+        <task name="wf:workflowTask" swimlane="assignee">
+           <event type="task-assign">
+              <script>
+                System.out.println("Task assigned: " + executionContext.getTaskInstance().getActorId());
+              </script>
+           </event>
+        </task>
+        <transition name="" to="end" />
+    </task-node>
+
+    <end-state name="end" />
+
+</process-definition>
\ No newline at end of file