You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2015/12/08 15:51:52 UTC
[2/2] activemq git commit:
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
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)
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c6759010
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c6759010
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c6759010
Branch: refs/heads/activemq-5.13.x
Commit: c67590104b0836906b0701c641eabb6e66989da6
Parents: 558dcc0
Author: gtully <ga...@gmail.com>
Authored: Tue Dec 8 11:25:50 2015 +0000
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Dec 8 09:51:37 2015 -0500
----------------------------------------------------------------------
.../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/c6759010/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());
}