Repository: activemq Updated Branches: refs/heads/activemq-5.13.x 9c82756ca -> e5b86116c
https://issues.apache.org/jira/browse/AMQ-6070 - rework regression - KahaDBStoreRecoveryExpiryTest had NPE in the logs, region dest not set on recovery listener for expiry case (cherry picked from commit 93092f7ea0e231cd7d615f8ee6420c9b73a5367f) Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/aa2a85ab Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/aa2a85ab Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/aa2a85ab Branch: refs/heads/activemq-5.13.x Commit: aa2a85abe582b8ae118aef8bfdf2cab9a098c727 Parents: 9c82756 Author: gtully <[email protected]> Authored: Fri Dec 11 15:27:28 2015 +0000 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Fri Dec 11 17:31:32 2015 +0000 ---------------------------------------------------------------------- .../src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java | 2 +- .../src/main/java/org/apache/activemq/broker/region/Queue.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/aa2a85ab/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java index d7c9aa8..8ad3bac 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java +++ b/activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java @@ -772,7 +772,7 @@ public class AdvisoryBroker extends BrokerFilter { private void handleFireFailure(String message, Throwable cause) { LOG.warn("Failed to fire {} advisory, reason: {}", message, cause); - LOG.debug("{} detail: {}", message, cause); + LOG.debug("{} detail: {}", message, cause, cause); } protected void fireAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command) throws Exception { http://git-wip-us.apache.org/repos/asf/activemq/blob/aa2a85ab/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java ---------------------------------------------------------------------- diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java index adc3a53..d447ebd 100755 --- a/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java +++ b/activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java @@ -286,12 +286,12 @@ public class Queue extends BaseDestination implements Task, UsageListener, Index } // Message could have expired while it was being // loaded.. + message.setRegionDestination(Queue.this); if (message.isExpired() && broker.isExpired(message)) { toExpire.add(message); return true; } if (hasSpace()) { - message.setRegionDestination(Queue.this); messagesLock.writeLock().lock(); try { try {
