Repository: activemq Updated Branches: refs/heads/master 13ec99493 -> 67ae2bd8a
https://issues.apache.org/jira/browse/AMQ-6070 - fix npe in org.apache.activemq.usecases.ExpiredMessagesWithNoConsumerTest#testExpireMessagesForDurableSubscriber Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/67ae2bd8 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/67ae2bd8 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/67ae2bd8 Branch: refs/heads/master Commit: 67ae2bd8a486d065495eff97997c33cd7cf9f160 Parents: 13ec994 Author: gtully <[email protected]> Authored: Mon Mar 7 16:44:33 2016 +0000 Committer: gtully <[email protected]> Committed: Mon Mar 7 16:44:33 2016 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/activemq/broker/region/Topic.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/67ae2bd8/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java index 8c63c02..1a9949e 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Topic.java @@ -657,6 +657,7 @@ public class Topic extends BaseDestination implements Task { for (Message message : toExpire) { for (DurableTopicSubscription sub : durableSubscribers.values()) { if (!sub.isActive()) { + message.setRegionDestination(this); messageExpired(connectionContext, sub, message); } }
