https://issues.apache.org/jira/browse/AMQ-3516 Add fix along with a unit test to ensure it stays fixed.
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java