Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Fix] ReservationExecution uses Controllers for jobCountSemaphoreSatisfied()

This commit is contained in:
Robert von Burg 2023-02-27 10:50:54 +01:00
parent 3a82050cb6
commit 090d7602a6
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
service/src/main/java/li/strolch/execution/policy/ReservationExecution.java
View File

@ -2,8 +2,10 @@ package li.strolch.execution.policy;
import static li.strolch.model.StrolchModelConstants.BAG_PARAMETERS;
import static li.strolch.model.StrolchModelConstants.PolicyConstants.*;
import static li.strolch.utils.ObjectHelper.isIn;
import li.strolch.exception.StrolchModelException;
import li.strolch.execution.Controller;
import li.strolch.model.Resource;
import li.strolch.model.StrolchModelConstants;
import li.strolch.model.activity.Action;
@ -105,8 +107,11 @@ public class ReservationExecution extends DurationExecution {
new String[] { action.getRootElement().getType() } :
jobCountSemaphoreTypesP.getValue().toArray(String[]::new);
long nrOfActivitiesInExecution = tx().streamActivities(types)
.filter(Activity::inExecutionPlanningPhase)
long nrOfActivitiesInExecution = getExecutionHandler().getControllers(tx().getRealmName())
.stream()
.map(Controller::getActivity)
.filter(a -> isIn(a.getType(), types, false))
.filter(Activity::inExecutionPhase)
.count();
IntegerParameter jobCountSemaphoreP = action.findObjectivesParam(PARAM_JOB_COUNT_SEMAPHORE, true);