X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=31153ffe64cf3eaea2ea524898f4e2ab4f63936f;hb=20436264b1f2a05c6e3e3e64290656c732e77dba;hp=8b1572022d93f031fbc0800022ce0f40e10de861;hpb=f855be86d4d02a29c4603522c793a3b0eecc961c;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java index 8b15720..31153ff 100644 --- a/src/main/java/net/pterodactylus/sone/data/Sone.java +++ b/src/main/java/net/pterodactylus/sone/data/Sone.java @@ -17,7 +17,7 @@ package net.pterodactylus.sone.data; -import static com.google.common.base.Preconditions.*; +import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.collect.FluentIterable.from; import static java.util.Arrays.asList; import static net.pterodactylus.sone.data.Album.FLATTENER; @@ -155,7 +155,7 @@ public class Sone implements Identified, Fingerprintable, Comparable { @Override public boolean apply(Sone sone) { - return sone.getTime() != 0; + return (sone == null) ? false : sone.getTime() != 0; } }; @@ -164,7 +164,7 @@ public class Sone implements Identified, Fingerprintable, Comparable { @Override public boolean apply(Sone sone) { - return sone.getIdentity() instanceof OwnIdentity; + return (sone == null) ? false : sone.getIdentity() instanceof OwnIdentity; } }; @@ -174,7 +174,7 @@ public class Sone implements Identified, Fingerprintable, Comparable { @Override public boolean apply(Sone sone) { - return !sone.getRootAlbum().getAlbums().isEmpty(); + return (sone == null) ? false : !sone.getRootAlbum().getAlbums().isEmpty(); } };