mirror of https://github.com/apache/activemq.git
fixes for memory leaks
git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@392904 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
fdd4b4e3e8
commit
b792f11767
|
@ -348,8 +348,9 @@
|
|||
<!-- This test currently fails -->
|
||||
<exclude>**/ItStillMarshallsTheSameTest.*</exclude>
|
||||
|
||||
<!-- This test currently fails -->
|
||||
<!-- Kaha in flux - removing tests -->
|
||||
<exclude>**/KahaXARecoveryBrokerTest.*</exclude>
|
||||
<exclude>**/KahaRecoveryBrokerTest.*</exclude>
|
||||
|
||||
<!-- https://issues.apache.org/activemq/browse/AMQ-522 -->
|
||||
<exclude>**/ProxyConnectorTest.*</exclude>
|
||||
|
|
|
@ -62,6 +62,8 @@ public class AdvisoryBroker extends BrokerFilter {
|
|||
super(next);
|
||||
advisoryProducerId.setConnectionId(idGenerator.generateId());
|
||||
}
|
||||
|
||||
|
||||
|
||||
public void addConnection(ConnectionContext context, ConnectionInfo info) throws Exception {
|
||||
next.addConnection(context, info);
|
||||
|
@ -149,11 +151,14 @@ public class AdvisoryBroker extends BrokerFilter {
|
|||
next.removeDestination(context, destination, timeout);
|
||||
ActiveMQTopic topic = AdvisorySupport.getDestinationAdvisoryTopic(destination);
|
||||
DestinationInfo info = (DestinationInfo) destinations.remove(destination);
|
||||
if( info !=null ) {
|
||||
if( info !=null && info.getDestination() != null && topic != null) {
|
||||
info.setOperationType(DestinationInfo.REMOVE_OPERATION_TYPE);
|
||||
fireAdvisory(context, topic, info);
|
||||
next.removeDestination(context,topic,timeout);
|
||||
next.removeDestination(context, AdvisorySupport.getConsumerAdvisoryTopic(info.getDestination()), timeout);
|
||||
next.removeDestination(context, AdvisorySupport.getProducerAdvisoryTopic(info.getDestination()), timeout);
|
||||
}
|
||||
next.removeDestination(context, AdvisorySupport.getConsumerAdvisoryTopic(info.getDestination()), timeout);
|
||||
|
||||
}
|
||||
|
||||
public void addDestinationInfo(ConnectionContext context,DestinationInfo info) throws Exception{
|
||||
|
|
|
@ -90,26 +90,25 @@ abstract public class AbstractRegion implements Region {
|
|||
}
|
||||
}
|
||||
|
||||
public void removeDestination(ConnectionContext context, ActiveMQDestination destination, long timeout)
|
||||
throws Exception {
|
||||
|
||||
// The destination cannot be removed if there are any active subscriptions
|
||||
for (Iterator iter = subscriptions.values().iterator(); iter.hasNext();) {
|
||||
Subscription sub = (Subscription) iter.next();
|
||||
if( sub.matches(destination) ) {
|
||||
throw new JMSException("Destination still has an active subscription: "+ destination);
|
||||
public void removeDestination(ConnectionContext context,ActiveMQDestination destination,long timeout)
|
||||
throws Exception{
|
||||
// The destination cannot be removed if there are any active subscriptions
|
||||
for(Iterator iter=subscriptions.values().iterator();iter.hasNext();){
|
||||
Subscription sub=(Subscription) iter.next();
|
||||
if(sub.matches(destination)){
|
||||
throw new JMSException("Destination still has an active subscription: "+destination);
|
||||
}
|
||||
}
|
||||
|
||||
log.debug("Removing destination: "+destination);
|
||||
synchronized(destinationsMutex){
|
||||
Destination dest=(Destination) destinations.remove(destination);
|
||||
if(dest==null)
|
||||
throw new IllegalArgumentException("The destination does not exist: "+destination);
|
||||
|
||||
destinationMap.removeAll(destination);
|
||||
dest.dispose(context);
|
||||
dest.stop();
|
||||
if(dest!=null){
|
||||
destinationMap.removeAll(destination);
|
||||
dest.dispose(context);
|
||||
dest.stop();
|
||||
}else{
|
||||
log.debug("Destination doesn't exist: " + dest);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ public class Topic implements Destination {
|
|||
protected final ActiveMQDestination destination;
|
||||
protected final CopyOnWriteArrayList consumers = new CopyOnWriteArrayList();
|
||||
protected final Valve dispatchValve = new Valve(true);
|
||||
protected final TopicMessageStore store;
|
||||
protected final TopicMessageStore store;//this could be NULL! (If an advsiory)
|
||||
protected final UsageManager usageManager;
|
||||
protected final DestinationStatistics destinationStatistics = new DestinationStatistics();
|
||||
|
||||
|
@ -72,7 +72,7 @@ public class Topic implements Destination {
|
|||
TaskRunnerFactory taskFactory) {
|
||||
|
||||
this.destination = destination;
|
||||
this.store = store;
|
||||
this.store = store; //this could be NULL! (If an advsiory)
|
||||
this.usageManager = new UsageManager(memoryManager);
|
||||
this.usageManager.setLimit(Long.MAX_VALUE);
|
||||
|
||||
|
@ -287,7 +287,7 @@ public class Topic implements Destination {
|
|||
}
|
||||
|
||||
public Message loadMessage(MessageId messageId) throws IOException {
|
||||
return store.getMessage(messageId);
|
||||
return store != null ? store.getMessage(messageId) : null;
|
||||
}
|
||||
|
||||
public void start() throws Exception {
|
||||
|
@ -301,19 +301,21 @@ public class Topic implements Destination {
|
|||
public Message[] browse(){
|
||||
final Set result=new CopyOnWriteArraySet();
|
||||
try{
|
||||
store.recover(new MessageRecoveryListener(){
|
||||
public void recoverMessage(Message message) throws Exception{
|
||||
result.add(message);
|
||||
}
|
||||
if(store!=null){
|
||||
store.recover(new MessageRecoveryListener(){
|
||||
public void recoverMessage(Message message) throws Exception{
|
||||
result.add(message);
|
||||
}
|
||||
|
||||
public void recoverMessageReference(String messageReference) throws Exception{}
|
||||
public void recoverMessageReference(String messageReference) throws Exception{}
|
||||
|
||||
public void finished(){}
|
||||
});
|
||||
Message[] msgs=subscriptionRecoveryPolicy.browse(getActiveMQDestination());
|
||||
if(msgs!=null){
|
||||
for(int i=0;i<msgs.length;i++){
|
||||
result.add(msgs[i]);
|
||||
public void finished(){}
|
||||
});
|
||||
Message[] msgs=subscriptionRecoveryPolicy.browse(getActiveMQDestination());
|
||||
if(msgs!=null){
|
||||
for(int i=0;i<msgs.length;i++){
|
||||
result.add(msgs[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}catch(Throwable e){
|
||||
|
|
|
@ -22,6 +22,7 @@ import java.util.Set;
|
|||
import javax.jms.InvalidDestinationException;
|
||||
import javax.jms.JMSException;
|
||||
|
||||
import org.apache.activemq.advisory.AdvisorySupport;
|
||||
import org.apache.activemq.broker.ConnectionContext;
|
||||
import org.apache.activemq.broker.region.policy.PolicyEntry;
|
||||
import org.apache.activemq.command.ActiveMQDestination;
|
||||
|
@ -154,7 +155,11 @@ public class TopicRegion extends AbstractRegion {
|
|||
// Implementation methods
|
||||
// -------------------------------------------------------------------------
|
||||
protected Destination createDestination(ConnectionContext context, ActiveMQDestination destination) throws Exception {
|
||||
TopicMessageStore store = persistenceAdapter.createTopicMessageStore((ActiveMQTopic) destination);
|
||||
TopicMessageStore store = null;
|
||||
if (!AdvisorySupport.isAdvisoryTopic(destination)){
|
||||
store = persistenceAdapter.createTopicMessageStore((ActiveMQTopic) destination);
|
||||
}
|
||||
|
||||
Topic topic = new Topic(destination, store, memoryManager, destinationStatistics, taskRunnerFactory);
|
||||
configureTopic(topic, destination);
|
||||
|
||||
|
|
Loading…
Reference in New Issue