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

Fixed AMQ-5160, fixed browse() to include messages from wrapped policy

This commit is contained in:
Dhiraj Bokde 2014-05-12 19:51:21 -07:00 committed by Dejan Bosanac
parent a581d010aa
commit 5576dc5d74
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java
View File

@ -17,6 +17,7 @@
package org.apache.activemq.broker.region.policy; package org.apache.activemq.broker.region.policy;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import org.apache.activemq.broker.Broker; import org.apache.activemq.broker.Broker;
@ -83,14 +84,23 @@ public class RetainedMessageSubscriptionRecoveryPolicy implements SubscriptionRe
} }
public Message[] browse(ActiveMQDestination destination) throws Exception { public Message[] browse(ActiveMQDestination destination) throws Exception {
List<Message> result = new ArrayList<Message>(); final List<Message> result = new ArrayList<Message>();
if (retainedMessage != null) { if (retainedMessage != null) {
DestinationFilter filter = DestinationFilter.parseFilter(destination); DestinationFilter filter = DestinationFilter.parseFilter(destination);
if (filter.matches(retainedMessage.getMessage().getDestination())) { if (filter.matches(retainedMessage.getMessage().getDestination())) {
result.add(retainedMessage.getMessage()); result.add(retainedMessage.getMessage());
} }
} }
return result.toArray(new Message[result.size()]); Message[] messages = result.toArray(new Message[result.size()]);
if (wrapped != null) {
final Message[] wrappedMessages = wrapped.browse(destination);
if (wrappedMessages != null && wrappedMessages.length > 0) {
final int origLen = messages.length;
messages = Arrays.copyOf(messages, origLen + wrappedMessages.length);
System.arraycopy(wrappedMessages, 0, messages, origLen, wrappedMessages.length);
}
}
return messages;
} }
public SubscriptionRecoveryPolicy copy() { public SubscriptionRecoveryPolicy copy() {