From 3b7507f6b756153568742b95ba1f7f871f359b5b Mon Sep 17 00:00:00 2001 From: Gary Tully Date: Thu, 1 Dec 2011 11:54:47 +0000 Subject: [PATCH] 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 git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1209046 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/activemq/broker/region/RegionBroker.java | 1 - 1 file changed, 1 deletion(-) diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java index 32edec7945..f8f2b3123c 100755 --- a/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java @@ -514,7 +514,6 @@ public class RegionBroker extends EmptyBroker { 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