From 29d57017ab7410c2413eec409b34cb678e1261e3 Mon Sep 17 00:00:00 2001 From: Mikhail Trofimov Date: Fri, 4 Jul 2025 13:02:26 +0300 Subject: [PATCH] Fix throwing nullpointer after validation --- .../java/ru/nbch/credit_tracker/facade/SignalFacade.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java index 00e9f71..0e1598c 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java @@ -117,7 +117,9 @@ public class SignalFacade { try { ValidationUtil.validateMonitoringRequest(monitoringRequest); } catch (SignalClientException e) { - signalService.rejectPackage(monitoringRequest); + if (monitoringRequest != null) { + signalService.rejectPackage(monitoringRequest); + } throw e; } @@ -174,8 +176,8 @@ public class SignalFacade { private boolean isZipFile(MultipartFile file) { return file.getContentType() != null && - (file.getContentType().equals("application/zip") || file.getContentType().equals("application/x-zip-compressed")) || - file.getOriginalFilename() != null && file.getOriginalFilename().toLowerCase().endsWith(".zip"); + (file.getContentType().equals("application/zip") || file.getContentType().equals("application/x-zip-compressed")) || + file.getOriginalFilename() != null && file.getOriginalFilename().toLowerCase().endsWith(".zip"); } public ResponseEntity findActivePackages(MonitoringActivePackagesRequest activePackagesRequest) {