Fixed AMQ-5160, removed producer's retain property from retained messages
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c915b19a Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c915b19a Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c915b19a Branch: refs/heads/trunk Commit: c915b19a205d37c2faad05178de716dca64981d5 Parents: 78950ec Author: Dhiraj Bokde <[email protected]> Authored: Tue May 13 12:15:14 2014 -0700 Committer: Dejan Bosanac <[email protected]> Committed: Mon May 26 11:07:19 2014 +0200 ---------------------------------------------------------------------- .../region/policy/RetainedMessageSubscriptionRecoveryPolicy.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/c915b19a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java index fb0313f..f1573fa 100644 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/RetainedMessageSubscriptionRecoveryPolicy.java @@ -56,6 +56,7 @@ public class RetainedMessageSubscriptionRecoveryPolicy implements SubscriptionRe if (message.getContent().getLength() > 0) { // non zero length message content retainedMessage = message.copy(); + retainedMessage.getMessage().removeProperty(RETAIN_PROPERTY); retainedMessage.getMessage().setProperty(RETAINED_PROPERTY, true); } else { // clear retained message
