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

fix up regression from: https://issues.apache.org/jira/browse/AMQ-3746 - ensure broker is always non null for topicSubscription 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1405817 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2012-11-05 14:54:43 +00:00
parent dee9e93266
commit c7d8715cd7
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-core/src/main/java/org/apache/activemq/broker/region/TopicSubscription.java
View File

@ -77,7 +77,7 @@ public class TopicSubscription extends AbstractSubscription {
super(broker, context, info);
this.usageManager = usageManager;
String matchedName = "TopicSubscription:" + CURSOR_NAME_COUNTER.getAndIncrement() + "[" + info.getConsumerId().toString() + "]";
if (info.getDestination().isTemporary() || broker == null || broker.getTempDataStore()==null ) {
if (info.getDestination().isTemporary() || broker.getTempDataStore()==null ) {
this.matched = new VMPendingMessageCursor(false);
} else {
this.matched = new FilePendingMessageCursor(broker,matchedName,false);

12
activemq-core/src/test/java/org/apache/activemq/broker/policy/PriorityNetworkDispatchPolicyTest.java
View File

@ -18,6 +18,7 @@ package org.apache.activemq.broker.policy;
import java.util.ArrayList;
import java.util.List;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.broker.region.Subscription;
import org.apache.activemq.broker.region.TopicSubscription;
@ -27,6 +28,8 @@ import org.apache.activemq.command.ActiveMQMessage;
import org.apache.activemq.command.ConsumerId;
import org.apache.activemq.command.ConsumerInfo;
import org.apache.activemq.usage.SystemUsage;
import org.apache.derby.iapi.jdbc.BrokeredStatement;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@ -41,6 +44,7 @@ public class PriorityNetworkDispatchPolicyTest {
ActiveMQMessage node = new ActiveMQMessage();
ConsumerId id = new ConsumerId();
ConnectionContext context = new ConnectionContext();
BrokerService brokerService = new BrokerService();
@Before
public void init() throws Exception {
@ -50,14 +54,20 @@ public class PriorityNetworkDispatchPolicyTest {
info.setNetworkConsumerPath(new ConsumerId[]{id});
}
@After
public void stopBroker() throws Exception {
brokerService.stop();
}
@Test
public void testRemoveLowerPriorityDup() throws Exception {
List<Subscription> consumers = new ArrayList<Subscription>();
for (int i=0; i<3; i++) {
ConsumerInfo instance = info.copy();
instance.setPriority((byte)i);
consumers.add(new TopicSubscription(null, context, instance, usageManager));
consumers.add(new TopicSubscription(brokerService.getBroker(), context, instance, usageManager));
}
underTest.dispatch(node, null, consumers);