Repository: activemq Updated Branches: refs/heads/master ab8f54b06 -> 69767a2f2
https://issues.apache.org/jira/browse/AMQ-5665 - memory store don't propagate connection context Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/69767a2f Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/69767a2f Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/69767a2f Branch: refs/heads/master Commit: 69767a2f2f91707cfe45f46651d4fdf0e55add41 Parents: ab8f54b Author: Dejan Bosanac <[email protected]> Authored: Thu Apr 9 13:27:14 2015 +0200 Committer: Dejan Bosanac <[email protected]> Committed: Thu Apr 9 13:29:37 2015 +0200 ---------------------------------------------------------------------- .../store/memory/MemoryTransactionStore.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/69767a2f/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java index c3d1b8a..aa2413d 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java +++ b/activemq-broker/src/main/java/org/apache/activemq/store/memory/MemoryTransactionStore.java @@ -140,23 +140,23 @@ public class MemoryTransactionStore implements TransactionStore { ProxyMessageStore proxyMessageStore = new ProxyMessageStore(messageStore) { @Override public void addMessage(ConnectionContext context, final Message send) throws IOException { - MemoryTransactionStore.this.addMessage(getDelegate(), send); + MemoryTransactionStore.this.addMessage(context, getDelegate(), send); } @Override public void addMessage(ConnectionContext context, final Message send, boolean canOptimize) throws IOException { - MemoryTransactionStore.this.addMessage(getDelegate(), send); + MemoryTransactionStore.this.addMessage(context, getDelegate(), send); } @Override public ListenableFuture<Object> asyncAddQueueMessage(ConnectionContext context, Message message) throws IOException { - MemoryTransactionStore.this.addMessage(getDelegate(), message); + MemoryTransactionStore.this.addMessage(context, getDelegate(), message); return new InlineListenableFuture(); } @Override public ListenableFuture<Object> asyncAddQueueMessage(ConnectionContext context, Message message, boolean canoptimize) throws IOException { - MemoryTransactionStore.this.addMessage(getDelegate(), message); + MemoryTransactionStore.this.addMessage(context, getDelegate(), message); return new InlineListenableFuture(); } @@ -181,23 +181,23 @@ public class MemoryTransactionStore implements TransactionStore { ProxyTopicMessageStore proxyTopicMessageStore = new ProxyTopicMessageStore(messageStore) { @Override public void addMessage(ConnectionContext context, final Message send) throws IOException { - MemoryTransactionStore.this.addMessage(getDelegate(), send); + MemoryTransactionStore.this.addMessage(context, getDelegate(), send); } @Override public void addMessage(ConnectionContext context, final Message send, boolean canOptimize) throws IOException { - MemoryTransactionStore.this.addMessage(getDelegate(), send); + MemoryTransactionStore.this.addMessage(context, getDelegate(), send); } @Override public ListenableFuture<Object> asyncAddTopicMessage(ConnectionContext context, Message message) throws IOException { - MemoryTransactionStore.this.addMessage(getDelegate(), message); + MemoryTransactionStore.this.addMessage(context, getDelegate(), message); return new InlineListenableFuture(); } @Override public ListenableFuture<Object> asyncAddTopicMessage(ConnectionContext context, Message message, boolean canOptimize) throws IOException { - MemoryTransactionStore.this.addMessage(getDelegate(), message); + MemoryTransactionStore.this.addMessage(context, getDelegate(), message); return new InlineListenableFuture(); } @@ -310,7 +310,7 @@ public class MemoryTransactionStore implements TransactionStore { * @param message * @throws IOException */ - void addMessage(final MessageStore destination, final Message message) throws IOException { + void addMessage(final ConnectionContext context, final MessageStore destination, final Message message) throws IOException { if (doingRecover) { return; @@ -340,7 +340,7 @@ public class MemoryTransactionStore implements TransactionStore { }); } else { - destination.addMessage(null, message); + destination.addMessage(context, message); } }
