From b4b7b9087e024617a83e29fb6d62644bd6c4b2fc Mon Sep 17 00:00:00 2001
From: Anton Romanov <romanov73@gmail.com>
Date: Fri, 31 May 2019 08:12:57 +0400
Subject: [PATCH] fix npe

---
 src/main/java/ru/ulstu/grant/service/GrantService.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/ru/ulstu/grant/service/GrantService.java b/src/main/java/ru/ulstu/grant/service/GrantService.java
index 86f8f1b..3243ace 100644
--- a/src/main/java/ru/ulstu/grant/service/GrantService.java
+++ b/src/main/java/ru/ulstu/grant/service/GrantService.java
@@ -232,10 +232,8 @@ public class GrantService extends BaseService {
 
     private boolean checkSameDeadline(GrantDto grantDto, Integer id) {
         Date date = grantDto.getDeadlines().get(0).getDate(); //дата с сайта киас
-        if (deadlineService.findByGrantIdAndDate(id, date).compareTo(date) == 0) { //если есть такая строка с датой
-            return true;
-        }
-        return false;
+        Date foundGrantDate = deadlineService.findByGrantIdAndDate(id, date);
+        return foundGrantDate != null && foundGrantDate.compareTo(date) == 0;
     }
 
     public List<User> getGrantAuthors(GrantDto grantDto) {