Repository: activemq Updated Branches: refs/heads/master 179dc3acb -> 88ec9dad9
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 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/88ec9dad Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/88ec9dad Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/88ec9dad Branch: refs/heads/master Commit: 88ec9dad9dc47790a3fc4e0f5ad939ea5530dad7 Parents: 179dc3a Author: gtully <[email protected]> Authored: Tue Dec 8 11:25:50 2015 +0000 Committer: gtully <[email protected]> Committed: Tue Dec 8 11:25:50 2015 +0000 ---------------------------------------------------------------------- .../apache/activemq/broker/region/cursors/AbstractStoreCursor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/88ec9dad/activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java ---------------------------------------------------------------------- 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 c6cca59..06bae97 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()); }
