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-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 88ec9dad9d)
This commit is contained in:
gtully 2015-12-08 11:25:50 +00:00 committed by Timothy Bish
parent 558dcc0479
commit c67590104b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java
View File

@ -97,9 +97,9 @@ public abstract class AbstractStoreCursor extends AbstractPendingMessageCursor i
public synchronized boolean recoverMessage(Message message, boolean cached) throws Exception { public synchronized boolean recoverMessage(Message message, boolean cached) throws Exception {
boolean recovered = false; boolean recovered = false;
message.setRegionDestination(regionDestination);
if (recordUniqueId(message.getMessageId())) { if (recordUniqueId(message.getMessageId())) {
if (!cached) { if (!cached) {
message.setRegionDestination(regionDestination);
if( message.getMemoryUsage()==null ) { if( message.getMemoryUsage()==null ) {
message.setMemoryUsage(this.getSystemUsage().getMemoryUsage()); message.setMemoryUsage(this.getSystemUsage().getMemoryUsage());
} }