diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java index 92451a125..36af7c2c8 100644 --- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java +++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/service/ExecutionRegisterService.java @@ -131,12 +131,18 @@ public class ExecutionRegisterService extends QueueConsumer implements Initializ amount = executionDeposit.getFirstLegAmount(); } - TradingClearingRegistry tkrForCounterPartyTkrId = tradingClearingRegistryMap.getSingleObjectByID( - common.getCounterPartyTradingClearingRegistryId() - ); - TradingClearingRegistry tkrForTkrId = tradingClearingRegistryMap.getSingleObjectByID( - common.getTradingClearingRegistryId() - ); + TradingClearingRegistry tkrForCounterPartyTkrId = null; + if (common.getCounterPartyTradingClearingRegistryId() != null) { + tkrForCounterPartyTkrId = tradingClearingRegistryMap.getSingleObjectByID( + common.getCounterPartyTradingClearingRegistryId() + ); + } + TradingClearingRegistry tkrForTkrId = null; + if (common.getTradingClearingRegistryId() != null) { + tkrForTkrId = tradingClearingRegistryMap.getSingleObjectByID( + common.getTradingClearingRegistryId() + ); + } Account moneyAccountForCounterPartyTkrId = null; Account depoAccountForCounterPartyTkrId = null; if (tkrForCounterPartyTkrId != null) {