activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rajdav...@apache.org
Subject svn commit: r666617 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region: BaseDestination.java Queue.java Topic.java
Date Wed, 11 Jun 2008 10:54:26 GMT
Author: rajdavies
Date: Wed Jun 11 03:54:26 2008
New Revision: 666617

URL: http://svn.apache.org/viewvc?rev=666617&view=rev
Log:
Fix for https://issues.apache.org/activemq/browse/AMQ-1790

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java?rev=666617&r1=666616&r2=666617&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/BaseDestination.java
Wed Jun 11 03:54:26 2008
@@ -16,6 +16,7 @@
  */
 package org.apache.activemq.broker.region;
 
+import java.io.IOException;
 import org.apache.activemq.broker.Broker;
 import org.apache.activemq.broker.BrokerService;
 import org.apache.activemq.broker.ConnectionContext;
@@ -363,5 +364,10 @@
             broker.isFull(context,this, usage);
         }
     }
+    
+    public void dispose(ConnectionContext context) throws IOException {
+        destinationStatistics.setParent(null);
+        this.memoryUsage.stop();
+    }
 
 }

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java?rev=666617&r1=666616&r2=666617&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Queue.java
Wed Jun 11 03:54:26 2008
@@ -479,10 +479,10 @@
     }
 
     public void dispose(ConnectionContext context) throws IOException {
+        super.dispose(context);
         if (store != null) {
             store.removeAllMessages(context);
         }
-        destinationStatistics.setParent(null);
     }
 
 	public void gc(){

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java?rev=666617&r1=666616&r2=666617&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/Topic.java
Wed Jun 11 03:54:26 2008
@@ -453,10 +453,10 @@
     }
 
     public void dispose(ConnectionContext context) throws IOException {
+        super.dispose(context);
         if (topicStore != null) {
             topicStore.removeAllMessages(context);
         }
-        destinationStatistics.setParent(null);
     }
 
     public void gc() {



Mime
View raw message