summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntje Fuhrmann2013-05-17 07:06:29 (EDT)
committerStephan Born2013-09-06 07:18:49 (EDT)
commit653da6b37f696d98bdd4906733ed562b0491be49 (patch)
treecce642d1ac36193e1cd8739450cd07b59788eff1
parent9d5f8529015bfdb9d33538362a681a2008f4afcf (diff)
downloadorg.eclipse.stardust.engine-653da6b37f696d98bdd4906733ed562b0491be49.zip
org.eclipse.stardust.engine-653da6b37f696d98bdd4906733ed562b0491be49.tar.gz
org.eclipse.stardust.engine-653da6b37f696d98bdd4906733ed562b0491be49.tar.bz2
Jira-ID: CRNT-29149
Errors in nightly regression test show activities can no longer be activated. git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/engine@64939 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Antje Fuhrmann <antje.fuhrmann@sungard.com>
-rw-r--r--stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/beans/WorkflowServiceImpl.java11
1 files changed, 5 insertions, 6 deletions
diff --git a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/beans/WorkflowServiceImpl.java b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/beans/WorkflowServiceImpl.java
index 999fbdb..1c1e058 100644
--- a/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/beans/WorkflowServiceImpl.java
+++ b/stardust-engine-core/src/main/java/org/eclipse/stardust/engine/core/runtime/beans/WorkflowServiceImpl.java
@@ -865,11 +865,6 @@ public class WorkflowServiceImpl implements Serializable, WorkflowService
&& currentUser.getOID() != 0
&& activityInstance.getCurrentUserPerformerOID() != currentUser.getOID())
{
- activityInstance.delegateToUser(currentUser);
- }
-
- if (activityInstance.getState() != ActivityInstanceState.Application)
- {
if (activityInstance instanceof ActivityInstanceBean)
{
((ActivityInstanceBean) activityInstance).internalDelegateToUser(currentUser,
@@ -877,9 +872,13 @@ public class WorkflowServiceImpl implements Serializable, WorkflowService
}
else
{
- activityInstance.activate();
+ activityInstance.delegateToUser(currentUser);
}
}
+ if (activityInstance.getState() != ActivityInstanceState.Application)
+ {
+ activityInstance.activate();
+ }
}
private void complete(IActivityInstance activityInstance, String context,