commit 4586ef5edf819b2d81a09f759ec45338de9a6505
author Robert Godfrey <rgodfrey@apache.org> Tue Nov 15 12:14:58 2016 +0000
committer Robert Godfrey <rgodfrey@apache.org> Tue Nov 15 12:14:58 2016 +0000
tree 06ab2c97ae1441db26becb7d9b845509d9ffecd6
parent f2fb107f7ccd750cd4a5d2e9990039b69d7cdb44

Iterators over the interested list may throw a NoSuchElementException even when hasNext() had previously been called

broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java

diff --git a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java
index abdbf77..89415e8 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/queue/QueueConsumerManagerImpl.java
@@ -263,7 +263,8 @@
         @Override
         public QueueConsumer<?> next()
         {
-            return _underlying.next().getQueueConsumer();
+            QueueConsumerNode next = _underlying.next();
+            return next == null ? null : next.getQueueConsumer();
         }
 
         @Override