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

Fix for https://issues.apache.org/activemq/browse/AMQ-1790 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@666617 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Davies 2008-06-11 10:54:26 +00:00
parent 32364744ee
commit 4b27e761c7
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
View File

@ -16,6 +16,7 @@
*/ */
package org.apache.activemq.broker.region; package org.apache.activemq.broker.region;
import java.io.IOException;
import org.apache.activemq.broker.Broker; import org.apache.activemq.broker.Broker;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.ConnectionContext; import org.apache.activemq.broker.ConnectionContext;
@ -363,5 +364,10 @@ public abstract class BaseDestination implements Destination {
broker.isFull(context,this, usage); broker.isFull(context,this, usage);
} }
} }
public void dispose(ConnectionContext context) throws IOException {
destinationStatistics.setParent(null);
this.memoryUsage.stop();
}
} }

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

@ -479,10 +479,10 @@ public class Queue extends BaseDestination implements Task {
} }
public void dispose(ConnectionContext context) throws IOException { public void dispose(ConnectionContext context) throws IOException {
super.dispose(context);
if (store != null) { if (store != null) {
store.removeAllMessages(context); store.removeAllMessages(context);
} }
destinationStatistics.setParent(null);
} }
public void gc(){ public void gc(){

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

@ -453,10 +453,10 @@ public class Topic extends BaseDestination implements Task{
} }
public void dispose(ConnectionContext context) throws IOException { public void dispose(ConnectionContext context) throws IOException {
super.dispose(context);
if (topicStore != null) { if (topicStore != null) {
topicStore.removeAllMessages(context); topicStore.removeAllMessages(context);
} }
destinationStatistics.setParent(null);
} }
public void gc() { public void gc() {