diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-03-05 16:28:29 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-03-05 16:28:29 +0000 |
| commit | a608c97bd3d6c0760a2061b520da1316fd83faf8 (patch) | |
| tree | c6dec2441e24b40bc8b9bc1b6e50b78695d48d90 | |
| parent | 6713bfc5ddc1ff6202dad0d950a252273f73f795 (diff) | |
| download | qpid-python-a608c97bd3d6c0760a2061b520da1316fd83faf8.tar.gz | |
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
| -rw-r--r-- | qpid/java/broker-core/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java | 4 |
1 files changed, 0 insertions, 4 deletions
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; } |