diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java index 245078c2b..cbc68c747 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/config/state_machine_2/specific/FinalSessionStateMachineConfig.java @@ -42,7 +42,6 @@ import ru.spcex.clearing.session.state.guard.StashedRegistriesPresentGuard; import ru.spcex.clearing.session.state.listener.MachineMonitoringListener; import ru.spcex.clearing.util.StateMachineUtil; import static ru.spcex.clearing.util.StateMachineUtil.chain; -import static ru.spcex.clearing.util.StateMachineUtil.invert; import ru.spcex.platform.classes.base.interfaces.ExecutionType; import ru.spcex.platform.enumeration.RegistryStatus; import ru.spcex.platform.enumeration.Section; @@ -196,7 +195,7 @@ public class FinalSessionStateMachineConfig .and() .withExternal() .source(TaskType.ObligationsAdmission).target(TaskType.InclusionToPool) - .guard(invert(oblAdmGuard)) + .guard(ctx -> false) /* invert(oblAdmGuard) */ .action(chain(obligationAdmissionContinueAction, inclusionToPoolAction)) .and() .withExternal() diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/interceptor/SessionStatusChangingInterceptor.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/interceptor/SessionStatusChangingInterceptor.java index 5919f2791..65a1926c5 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/interceptor/SessionStatusChangingInterceptor.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/session/state/interceptor/SessionStatusChangingInterceptor.java @@ -40,7 +40,7 @@ public class SessionStatusChangingInterceptor extends StateMachineInterceptorAda public StateContext preTransition(StateContext ctx) { String id = StateMachineUtil.getId(ctx); try { - State source = ctx.getTarget(); + State source = ctx.getSource(); State target = ctx.getTarget(); if (target == null) { throw excp(