From 5e7e31066c39eb1b427d8702830ab62e70a6061c Mon Sep 17 00:00:00 2001
From: etreschenkov <etreschenkov@mfd.ru>
Date: Wed, 28 Jun 2023 19:34:55 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-373

---
 .../gatewayapi/config/RestTemplateErrorHandler.java        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateErrorHandler.java b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateErrorHandler.java
index be9e81df9..ab506cc81 100644
--- a/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateErrorHandler.java
+++ b/clearing-parent/gateway-api/src/main/java/ru/spcex/clearing/gatewayapi/config/RestTemplateErrorHandler.java
@@ -56,7 +56,12 @@ public class RestTemplateErrorHandler implements ResponseErrorHandler {
             errorMessage = String.format("Error: %s", error);
         } else {
             OutboundRequest outboundRequest = outboundRequestByUuid.remove(errorResponse.getId());
-            errorMessage = makeMessage(outboundRequest, errorResponse);
+            if (outboundRequest != null) {
+                errorMessage = makeMessage(outboundRequest, errorResponse);
+            } else {
+                log.warn("Not found request by uuid: {}; send default error message", errorResponse.getId());
+                errorMessage = errorResponse.getMessage();
+            }
         }
         NotificationNewRequest notificationNewRequest = createNotification(errorMessage);
         kafaSender.sendRequestToQueue(Consts.NOTIFICATION_NEW, notificationNewRequest);