svn commit: r1209046 - /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java

[gt...@apache.org]

Author: gtully
Date: Thu Dec  1 11:54:47 2011
New Revision: 1209046

URL: http://svn.apache.org/viewvc?rev=1209046&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-2524 and https://issues.apache.org/jira/browse/AMQ-3092 - two competing fixes for the same underlying issue. Use a combination of the changes, disposed without the duplicate check for existance in the destinations. Removes one additional query on the destinations map

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java?rev=1209046&r1=1209045&r2=1209046&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java Thu Dec  1 11:54:47 2011
@@ -514,7 +514,6 @@ public class RegionBroker extends EmptyB
     public void send(ProducerBrokerExchange producerExchange, Message message) throws Exception {
         message.setBrokerInTime(System.currentTimeMillis());
         if (producerExchange.isMutable() || producerExchange.getRegion() == null
-                || (producerExchange.getRegion() != null && producerExchange.getRegion().getDestinationMap().get(message.getDestination()) == null)
                 || (producerExchange.getRegionDestination() != null && producerExchange.getRegionDestination().isDisposed())) {
             ActiveMQDestination destination = message.getDestination();
             // ensure the destination is registered with the RegionBroker