From 488c4e7cca97df299243ace6e4a704ae11f46a4c Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 7 Aug 2016 19:46:44 +0800 Subject: [PATCH] Avoid NPE --- source/net/filebot/web/SeriesInfo.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/net/filebot/web/SeriesInfo.java b/source/net/filebot/web/SeriesInfo.java index f2e860bc..70876acc 100644 --- a/source/net/filebot/web/SeriesInfo.java +++ b/source/net/filebot/web/SeriesInfo.java @@ -6,6 +6,7 @@ import static java.util.Collections.*; import java.io.Serializable; import java.util.List; import java.util.Locale; +import java.util.Objects; public class SeriesInfo implements Serializable { @@ -175,14 +176,14 @@ public class SeriesInfo implements Serializable { @Override public int hashCode() { - return id; + return id == null ? 0 : id; } @Override public boolean equals(Object object) { if (object instanceof SeriesInfo) { SeriesInfo other = (SeriesInfo) object; - return id.equals(other.id) && database.equals(other.database); + return Objects.equals(id, other.id) && Objects.equals(database, other.database); } return false; }