Repository: qpid-jms
Updated Branches:
  refs/heads/master c9535a2ac -> 0c8f52ab7


QPIDJMS-168 / QPIDJMS-166

simplify the hasMoreElements logic



Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/0c8f52ab
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/0c8f52ab
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/0c8f52ab

Branch: refs/heads/master
Commit: 0c8f52ab7b59b3384bc0f51b8537e4e005c1180f
Parents: c9535a2
Author: Timothy Bish <[email protected]>
Authored: Tue Apr 5 18:22:12 2016 -0400
Committer: Timothy Bish <[email protected]>
Committed: Tue Apr 5 18:22:12 2016 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0c8f52ab/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java
----------------------------------------------------------------------
diff --git 
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java 
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java
index 280cbca..700463f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java
@@ -122,15 +122,13 @@ public class JmsQueueBrowser implements AutoCloseable, 
QueueBrowser, Enumeration
 
                 if (next != null) {
                     return true;
+                } else {
+                    destroyConsumer();
+                    return false;
                 }
             } else {
                 return true;
             }
-
-            if (next == null || !session.isStarted()) {
-                destroyConsumer();
-                return false;
-            }
         }
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to