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