From 797718ddc3635f9ed6c6816617bf5015bb8ca96a Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 12 Apr 2021 11:01:59 +0400 Subject: [PATCH] #12 -- Fix NPE --- src/main/java/ru/ulstu/extractor/model/Commit.java | 6 +++++- src/main/java/ru/ulstu/extractor/model/FileChange.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/ru/ulstu/extractor/model/Commit.java b/src/main/java/ru/ulstu/extractor/model/Commit.java index 31c6eac..821d3d8 100644 --- a/src/main/java/ru/ulstu/extractor/model/Commit.java +++ b/src/main/java/ru/ulstu/extractor/model/Commit.java @@ -91,6 +91,10 @@ public class Commit extends BaseEntity { } public boolean containsEntity() { - return fileChanges.stream().anyMatch(FileChange::isContainsEntity); + return fileChanges != null && fileChanges.stream().anyMatch( + fileChange -> fileChange != null + && fileChange.isContainsEntity() != null + && fileChange.isContainsEntity() + ); } } diff --git a/src/main/java/ru/ulstu/extractor/model/FileChange.java b/src/main/java/ru/ulstu/extractor/model/FileChange.java index ad800c2..2a34ff3 100644 --- a/src/main/java/ru/ulstu/extractor/model/FileChange.java +++ b/src/main/java/ru/ulstu/extractor/model/FileChange.java @@ -25,7 +25,7 @@ public class FileChange extends BaseEntity { @Transient private boolean added; - private boolean containsEntity; + private Boolean containsEntity; @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) @JoinColumn(name = "file_change_id", unique = true) @@ -79,7 +79,7 @@ public class FileChange extends BaseEntity { return added; } - public boolean isContainsEntity() { + public Boolean isContainsEntity() { return containsEntity; }