From afdfa0d6d6abba5982a98c946c772e52b01f6c06 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Mon, 2 Oct 2023 18:40:26 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-280 npe possible fix

---
 .../service/ExecutionRegisterService.java      | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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) {