You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/05/18 06:09:56 UTC
[2/3] qpid-broker-j git commit: QPID-7750: Guard
AbstractQueue#getOldestMessageArrivalTime against NPE if queue not yet open
QPID-7750: Guard AbstractQueue#getOldestMessageArrivalTime against NPE if queue not yet open
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/8a630aa7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/8a630aa7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/8a630aa7
Branch: refs/heads/master
Commit: 8a630aa7faf55a32dd84bfde7734e775d38a4901
Parents: fcd9134
Author: Keith Wall <ke...@gmail.com>
Authored: Wed May 17 22:36:02 2017 +0100
Committer: Keith Wall <ke...@gmail.com>
Committed: Wed May 17 22:38:25 2017 +0100
----------------------------------------------------------------------
.../apache/qpid/server/queue/AbstractQueue.java | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/8a630aa7/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
index 640bc13..0ec72df 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
@@ -1387,26 +1387,17 @@ public abstract class AbstractQueue<X extends AbstractQueue<X>>
while(oldestMessageArrivalTime == -1L)
{
- QueueEntry entry = getEntries().getOldestEntry();
+ QueueEntryList entries = getEntries();
+ QueueEntry entry = entries == null ? null : entries.getOldestEntry();
if (entry != null)
{
ServerMessage message = entry.getMessage();
if(message != null)
{
- try
+ try(MessageReference reference = message.newReference())
{
- MessageReference reference = message.newReference();
- try
- {
- oldestMessageArrivalTime = reference.getMessage().getArrivalTime();
- }
- finally
- {
- reference.release();
- }
-
-
+ oldestMessageArrivalTime = reference.getMessage().getArrivalTime();
}
catch (MessageDeletedException e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org