[AMQ-2772] ActiveMQConnectionConsumer will break failover

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 5.3.2
• Fix Version/s: 5.4.0
• Component/s: Connector
• Assignee: Gary Tully
• Reporter: Siim Kaalep
• Created: 10/Jun/10 08:42
• Updated: 11/Jun/10 13:44
• Resolved: 11/Jun/10 13:44

Description

ActiveMQConnection.transportInterupted assumes that
dispatchers.size() == all session's consumers + one advisoryConsumer

But ActiveMQConnectionConsumer also registers itself as dispatcher in constructor.

On failover attempt connection will remain in waiting state.
Logging "dispatch paused, waiting for outstanding dispatch interruption processing (1) to complete.."

ActiveMQConnectionConsumer is used in ActiveMQ resource adapter in ActiveMQEndpointWorker.

Robust fix:

 
Index: trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
===================================================================
--- trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
+++ trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
@@ -1840,7 +1840,7 @@
 	}
 
     public void transportInterupted() {
-        transportInterruptionProcessingComplete = new CountDownLatch(dispatchers.size() - (advisoryConsumer != null ? 1:0));
+        transportInterruptionProcessingComplete = new CountDownLatch(dispatchers.size() - (advisoryConsumer != null ? 1:0) - connectionConsumers.size());
         if (LOG.isDebugEnabled()) {
             LOG.debug("transport interrupted, dispatchers: " + transportInterruptionProcessingComplete.getCount());
         }