bug[ats_ATS295073]: Transition-To assigns workflows to first selected

Change-Id: I6b7f0103f73f42ed6d8445c4cf82670db7d71351

1 files changed, 15 insertions, 18 deletions

diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/transition/TransitionManager.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/transition/TransitionManager.java
index 42501d4fa2a..d11a9401610 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/transition/TransitionManager.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/transition/TransitionManager.java
@@ -62,7 +62,6 @@ public class TransitionManager implements IAtsTransitionManager, IExecuteListene
    private final ITransitionHelper helper;
    private String completedCancellationReason = null;
    private Date transitionOnDate;
-   private List<IAtsUser> toAssignees;
    private final IAtsUserService userService;
    private final IAtsReviewService reviewService;
    private final IAtsWorkItemService workItemService;
@@ -553,26 +552,24 @@ public class TransitionManager implements IAtsTransitionManager, IExecuteListene
     */
    @Override
    public List<? extends IAtsUser> getToAssignees(IAtsWorkItem workItem, IAtsStateDefinition toState) throws OseeCoreException {
-      if (toAssignees == null) {
-         toAssignees = new ArrayList<>();
-         if (toState.getStateType().isWorkingState()) {
-            Collection<? extends IAtsUser> requestedAssignees = helper.getToAssignees(workItem);
-            if (requestedAssignees != null) {
-               for (IAtsUser user : requestedAssignees) {
-                  toAssignees.add(user);
-               }
+      List<IAtsUser> toAssignees = new ArrayList<>();
+      if (toState.getStateType().isWorkingState()) {
+         Collection<? extends IAtsUser> requestedAssignees = helper.getToAssignees(workItem);
+         if (requestedAssignees != null) {
+            for (IAtsUser user : requestedAssignees) {
+               toAssignees.add(user);
             }
-            if (toAssignees.contains(AtsCoreUsers.UNASSIGNED_USER)) {
-               toAssignees.remove(AtsCoreUsers.UNASSIGNED_USER);
+         }
+         if (toAssignees.contains(AtsCoreUsers.UNASSIGNED_USER)) {
+            toAssignees.remove(AtsCoreUsers.UNASSIGNED_USER);
+            toAssignees.add(getTransitionAsUser());
+         }
+         if (toAssignees.isEmpty()) {
+            if (helper.isSystemUser()) {
+               toAssignees.add(AtsCoreUsers.UNASSIGNED_USER);
+            } else {
                toAssignees.add(getTransitionAsUser());
             }
-            if (toAssignees.isEmpty()) {
-               if (helper.isSystemUser()) {
-                  toAssignees.add(AtsCoreUsers.UNASSIGNED_USER);
-               } else {
-                  toAssignees.add(getTransitionAsUser());
-               }
-            }
          }
       }
       return toAssignees;