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

https://issues.apache.org/activemq/browse/AMQ-2663 - keepDurableSubsActive=false reactivation 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@952946 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bosanac Dejan 2010-06-09 10:31:49 +00:00
parent 121ecb5599
commit 9fcf16eaab
3 changed files with 90 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java
View File

@ -111,6 +111,7 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us
for (Iterator<Destination> iter = destinations.values()
.iterator(); iter.hasNext();) {
Topic topic = (Topic) iter.next();
add(context, topic);
topic.activate(context, this);
}
}

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

@ -28,7 +28,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
* perist pendingCount messages pendingCount message (messages awaiting disptach
* persist pendingCount messages pendingCount message (messages awaiting disptach
* to a consumer) cursor
*
* @version $Revision$

88
activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubscriptionReactivationTest.java Normal file
View File

@ -0,0 +1,88 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.activemq.usecases;
import javax.jms.Connection;
import javax.jms.Message;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.Topic;
import javax.jms.TopicSubscriber;
import junit.framework.Test;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
public class DurableSubscriptionReactivationTest extends EmbeddedBrokerTestSupport {
public boolean keepDurableSubsActive;
public void initCombosForTestReactivateKeepaliveSubscription() {
addCombinationValues("keepDurableSubsActive", new Object[] { new Boolean(true), new Boolean(false) });
}
public void testReactivateKeepaliveSubscription() throws Exception {
Connection connection = createConnection();
connection.setClientID("cliID");
connection.start();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
TopicSubscriber subscriber = session.createDurableSubscriber((Topic) createDestination(), "subName");
subscriber.close();
connection.close();
connection = createConnection();
connection.start();
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageProducer producer = session.createProducer(createDestination());
producer.send(session.createMessage());
connection.close();
connection = createConnection();
connection.setClientID("cliID");
connection.start();
session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
subscriber = session.createDurableSubscriber((Topic) createDestination(), "subName");
Message message = subscriber.receive(1 * 1000);
subscriber.close();
connection.close();
assertNotNull("Message not received.", message);
}
protected void setUp() throws Exception {
useTopic = true;
super.setUp();
}
protected void tearDown() throws Exception {
super.tearDown();
}
@Override
protected BrokerService createBroker() throws Exception {
BrokerService answer = super.createBroker();
answer.setKeepDurableSubsActive(keepDurableSubsActive);
return answer;
}
public static Test suite() {
return suite(DurableSubscriptionReactivationTest.class);
}
}