From 9ae2926b881986bf52ddf1d7f178ad0fba13bad0 Mon Sep 17 00:00:00 2001 From: rajesh Date: Mon, 2 Mar 2026 17:55:55 +0530 Subject: [PATCH] Applied null check --- .../tendermanagement/dao/AppointmentDao.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java index aa81aab5..ecff43b2 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/AppointmentDao.java @@ -534,7 +534,7 @@ public class AppointmentDao { log.info("Scheduler shut down for applicationId: {}", applicationId); } - private void processNdgGeneration(ApplicationEntity application, CompanyEntity company, HubEntity hub) { + private void processNdgGeneration(ApplicationEntity application, CompanyEntity company, HubEntity hub) { // Validate application, company, and hub Long applicationId = application.getId(); log.info("Starting NDG generation process for applicationId: {}", applicationId); @@ -560,10 +560,12 @@ public class AppointmentDao { }else { ndgResponse = retrieveNdgByVatNumber(company.getVatNumber(), authorizationToken, hub, application,company); } - if (isNdgValid(ndgResponse.getNdg())) { - saveNdg(application, company, ndgResponse.getNdg()); - log.info("NDG successfully generated for applicationId: {}", applicationId); - } else { + if(ndgResponse!=null) { + if (isNdgValid(ndgResponse.getNdg())) { + saveNdg(application, company, ndgResponse.getNdg()); + log.info("NDG successfully generated for applicationId: {}", applicationId); + } + }else { log.info("Polling for NDG for applicationId: {}", applicationId); handleNdgPolling(application, company, hub, authorizationToken); } @@ -743,6 +745,9 @@ public class AppointmentDao { String responseJson = getNdgFromExternalService(vatNumber, authorizationToken); // Parse and return the NDG response AppointmentLoginResponse loginResponse=parseNdgResponse(responseJson); + if(loginResponse==null){ + return null; + } ObjectMapper objectMapper = new ObjectMapper(); JsonNode rootNode = null; try {