Resolved conflicts while sync with master

2025-05-21 15:00:06 +05:30
parent 81ee85c6f5 7767dc184f
commit 9d153f6614
2 changed files with 41 additions and 40 deletions
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/SystemEmailService.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/SystemEmailService.java
@@ -73,7 +73,10 @@ public class SystemEmailService implements EmailService {

                throw new RuntimeException("Failed to send email via Mailgun: " + (response != null ? response.getMessage() : "No response from Mailgun"), e);
            }
-            emailLogRequest.setEmailServiceResponse(response.toString());
+            if(response != null) {
+            	emailLogRequest.setEmailServiceResponse(response.toString());
+            }
+            
            emailLogDao.createEmailLog(emailLogRequest);
        }
    }