Repository: activemq-artemis Updated Branches: refs/heads/master 8911efd0c -> 73c79de8a
ARTEMIS-1105 null pointer when replicating paged messages https://issues.apache.org/jira/browse/ARTEMIS-1105 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/185b0cb2 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/185b0cb2 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/185b0cb2 Branch: refs/heads/master Commit: 185b0cb2a888b37dfd999e05e7211853a5bbe0ac Parents: 8911efd Author: Andy Taylor <[email protected]> Authored: Mon Apr 10 12:04:46 2017 +0100 Committer: Clebert Suconic <[email protected]> Committed: Mon Apr 10 12:25:25 2017 -0400 ---------------------------------------------------------------------- .../activemq/artemis/core/paging/impl/PagedMessageImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/185b0cb2/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java index b770623..0b207ec 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagedMessageImpl.java @@ -73,8 +73,8 @@ public class PagedMessageImpl implements PagedMessage { LargeServerMessage lgMessage = storage.createLargeMessage(); ActiveMQBuffer buffer = ActiveMQBuffers.wrappedBuffer(largeMessageLazyData); - LargeMessagePersister.getInstance().decode(buffer, lgMessage); - ((LargeServerMessage) message).incrementDelayDeletionCount(); + lgMessage = LargeMessagePersister.getInstance().decode(buffer, lgMessage); + lgMessage.incrementDelayDeletionCount(); this.message = lgMessage; largeMessageLazyData = null; }
