From a608c97bd3d6c0760a2061b520da1316fd83faf8 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Wed, 5 Mar 2014 16:28:29 +0000 Subject: QPID-5577 : compareTo should throw an NPE if the object being compared to is null git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1574563 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java index 91148b1dc0..e3b56d25b7 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java @@ -439,10 +439,6 @@ public abstract class QueueEntryImpl implements QueueEntry public int compareTo(final QueueEntry o) { - if(o == null) - { - return 1; - } QueueEntryImpl other = (QueueEntryImpl)o; return getEntryId() > other.getEntryId() ? 1 : getEntryId() < other.getEntryId() ? -1 : 0; } -- cgit v1.2.1