Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-2320 'while' statement does not loop

This commit is contained in:
Jiri Danek 2019-04-25 16:14:27 +02:00 committed by Michael Andre Pearce
parent b33874488b
commit 781e4c460d
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View File

@ -3748,16 +3748,12 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
}
}
while (true) {
if (messagesIterator != null && messagesIterator.hasNext()) {
MessageReference msg = messagesIterator.next();
if (msg.isPaged()) {
previouslyBrowsed.add(((PagedReference) msg).getPosition());
}
return msg;
} else {
break;
if (messagesIterator != null && messagesIterator.hasNext()) {
MessageReference msg = messagesIterator.next();
if (msg.isPaged()) {
previouslyBrowsed.add(((PagedReference) msg).getPosition());
}
return msg;
}
if (getPagingIterator() != null) {
while (getPagingIterator().hasNext()) {

18
tests/joram-tests/src/test/java/org/apache/activemq/artemis/common/SpawnedJMSServer.java
View File

@ -48,16 +48,14 @@ public class SpawnedJMSServer {
System.out.println("OK");
String line = null;
while ((line = br.readLine()) != null) {
if ("STOP".equals(line.trim())) {
stopServer();
System.out.println("Server stopped");
System.exit(0);
} else {
// stop anyway but with an error status
System.exit(1);
}
String line = br.readLine();
if (line != null && "STOP".equals(line.trim())) {
stopServer();
System.out.println("Server stopped");
System.exit(0);
} else {
// stop anyway but with an error status
System.exit(1);
}
} catch (Throwable t) {
t.printStackTrace();