Merge branch 'release/0.9-rc1'

[Sone.git] / src / main / java / net / pterodactylus / sone / data / Reply.java

diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java
index a686023..e9b7a1d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Reply.java
+++ b/src/main/java/net/pterodactylus/sone/data/Reply.java
@@ -28,7 +28,7 @@ import com.google.common.base.Predicate;
  *            The type of the reply
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public interface Reply<T extends Reply<T>> {
+public interface Reply<T extends Reply<T>> extends Identified {
 
        /** Comparator that sorts replies ascending by time. */
        public static final Comparator<? super Reply<?>> TIME_COMPARATOR = new Comparator<Reply<?>>() {
@@ -51,7 +51,7 @@ public interface Reply<T extends Reply<T>> {
                 */
                @Override
                public boolean apply(Reply<?> reply) {
-                       return reply.getTime() <= System.currentTimeMillis();
+                       return (reply != null) && (reply.getTime() <= System.currentTimeMillis());
                }
 
        };