Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Gary Tully 2011-12-01 11:54:47 +00:00
parent dad86e6891
commit 3b7507f6b7
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-core/src/main/java/org/apache/activemq/broker/region/RegionBroker.java
View File

@ -514,7 +514,6 @@ public class RegionBroker extends EmptyBroker {
public void send(ProducerBrokerExchange producerExchange, Message message) throws Exception { public void send(ProducerBrokerExchange producerExchange, Message message) throws Exception {
message.setBrokerInTime(System.currentTimeMillis()); message.setBrokerInTime(System.currentTimeMillis());
if (producerExchange.isMutable() || producerExchange.getRegion() == null if (producerExchange.isMutable() || producerExchange.getRegion() == null
|| (producerExchange.getRegion() != null && producerExchange.getRegion().getDestinationMap().get(message.getDestination()) == null)
|| (producerExchange.getRegionDestination() != null && producerExchange.getRegionDestination().isDisposed())) { || (producerExchange.getRegionDestination() != null && producerExchange.getRegionDestination().isDisposed())) {
ActiveMQDestination destination = message.getDestination(); ActiveMQDestination destination = message.getDestination();
// ensure the destination is registered with the RegionBroker // ensure the destination is registered with the RegionBroker