From c67590104b0836906b0701c641eabb6e66989da6 Mon Sep 17 00:00:00 2001 From: gtully Date: Tue, 8 Dec 2015 11:25:50 +0000 Subject: [PATCH] https://issues.apache.org/jira/browse/AMQ-5454 https://issues.apache.org/jira/browse/AMQ-6070 - in the case of duplicates from the store the regiondestination was not set (cherry picked from commit 88ec9dad9dc47790a3fc4e0f5ad939ea5530dad7) --- .../activemq/broker/region/cursors/AbstractStoreCursor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java index c6cca59fcf..06bae97572 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java @@ -97,9 +97,9 @@ public abstract class AbstractStoreCursor extends AbstractPendingMessageCursor i public synchronized boolean recoverMessage(Message message, boolean cached) throws Exception { boolean recovered = false; + message.setRegionDestination(regionDestination); if (recordUniqueId(message.getMessageId())) { if (!cached) { - message.setRegionDestination(regionDestination); if( message.getMemoryUsage()==null ) { message.setMemoryUsage(this.getSystemUsage().getMemoryUsage()); }