You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2006/07/27 18:52:51 UTC
svn commit: r426134 - in /incubator/activemq/trunk/activemq-core/src:
main/java/org/apache/activemq/ main/java/org/apache/activemq/broker/
main/java/org/apache/activemq/broker/region/
main/java/org/apache/activemq/thread/ test/resources/org/apache/acti...
Author: chirino
Date: Thu Jul 27 09:52:50 2006
New Revision: 426134
URL: http://svn.apache.org/viewvc?rev=426134&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQ-847
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml
incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?rev=426134&r1=426133&r2=426134&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Thu Jul 27 09:52:50 2006
@@ -540,10 +540,12 @@
if (!closed.get()) {
closing.set(true);
- if (advisoryConsumer != null) {
- advisoryConsumer.dispose();
- advisoryConsumer = null;
- }
+ this.factoryStats.removeConnection(this);
+
+ if( advisoryConsumer!=null ) {
+ advisoryConsumer.dispose();
+ advisoryConsumer=null;
+ }
for (Iterator i = this.sessions.iterator(); i.hasNext();) {
ActiveMQSession s = (ActiveMQSession) i.next();
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java?rev=426134&r1=426133&r2=426134&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/AbstractConnection.java Thu Jul 27 09:52:50 2006
@@ -389,6 +389,13 @@
}
public Response processBrokerInfo(BrokerInfo info) {
+
+ // We only expect to get one broker info command per connection
+ if( this.brokerInfo!=null ) {
+ log.warn("Unexpected extra broker info command received: "+info);
+ }
+
+ this.brokerInfo = info;
broker.addBroker(this, info);
return null;
}
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java?rev=426134&r1=426133&r2=426134&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/IndirectMessageReference.java Thu Jul 27 09:52:50 2006
@@ -146,6 +146,7 @@
synchronized public void drop() {
dropped=true;
+ lockOwner = null;
if( !persistent && message!=null ) {
message.decrementReferenceCount();
message=null;
@@ -156,7 +157,7 @@
if( !regionDestination.lock(this, subscription) )
return false;
synchronized (this) {
- if( lockOwner!=null && lockOwner!=subscription )
+ if( dropped || (lockOwner!=null && lockOwner!=subscription) )
return false;
lockOwner = subscription;
return true;
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java?rev=426134&r1=426133&r2=426134&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/thread/Scheduler.java Thu Jul 27 09:52:50 2006
@@ -51,6 +51,7 @@
ScheduledFuture ticket = (ScheduledFuture) clockTickets.remove(task);
if( ticket!=null ) {
ticket.cancel(true);
+ clockDaemon.remove(task);
}
}
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml?rev=426134&r1=426133&r2=426134&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker1.xml Thu Jul 27 09:52:50 2006
@@ -19,6 +19,18 @@
<broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+ <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">">
+ <subscriptionRecoveryPolicy>
+ <noSubscriptionRecoveryPolicy />
+ </subscriptionRecoveryPolicy>
+ </policyEntry>
+ </policyEntries></policyMap>
+ </destinationPolicy>
+
<transportConnectors>
<transportConnector uri="tcp://localhost:61616"/>
<transportConnector uri="vm://broker1"/>
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml?rev=426134&r1=426133&r2=426134&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/reconnect-broker2.xml Thu Jul 27 09:52:50 2006
@@ -19,6 +19,18 @@
<broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+ <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">">
+ <subscriptionRecoveryPolicy>
+ <noSubscriptionRecoveryPolicy />
+ </subscriptionRecoveryPolicy>
+ </policyEntry>
+ </policyEntries></policyMap>
+ </destinationPolicy>
+
<transportConnectors>
<transportConnector uri="tcp://localhost:61617"/>
<transportConnector uri="vm://broker2"/>
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml?rev=426134&r1=426133&r2=426134&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker1.xml Thu Jul 27 09:52:50 2006
@@ -19,6 +19,18 @@
<broker brokerName="broker1" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+ <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">">
+ <subscriptionRecoveryPolicy>
+ <noSubscriptionRecoveryPolicy />
+ </subscriptionRecoveryPolicy>
+ </policyEntry>
+ </policyEntries></policyMap>
+ </destinationPolicy>
+
<transportConnectors>
<transportConnector uri="tcp://localhost:61616"/>
<transportConnector uri="vm://broker1"/>
Modified: incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml?rev=426134&r1=426133&r2=426134&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml (original)
+++ incubator/activemq/trunk/activemq-core/src/test/resources/org/apache/activemq/network/ssh-reconnect-broker2.xml Thu Jul 27 09:52:50 2006
@@ -19,6 +19,18 @@
<broker brokerName="broker2" persistent="false" useShutdownHook="false" useJmx="false" xmlns="http://activemq.org/config/1.0">
+ <!-- disabling the subscription recovery policy allows us take memory leaks easier -->
+ <destinationPolicy>
+ <policyMap>
+ <policyEntries>
+ <policyEntry topic=">">
+ <subscriptionRecoveryPolicy>
+ <noSubscriptionRecoveryPolicy />
+ </subscriptionRecoveryPolicy>
+ </policyEntry>
+ </policyEntries></policyMap>
+ </destinationPolicy>
+
<transportConnectors>
<transportConnector uri="tcp://localhost:61617"/>
<transportConnector uri="vm://broker2"/>