Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
gtully 2015-12-11 15:27:28 +00:00
parent 31d99b6aa9
commit 93092f7ea0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
View File

@ -772,7 +772,7 @@ public class AdvisoryBroker extends BrokerFilter {
private void handleFireFailure(String message, Throwable cause) { private void handleFireFailure(String message, Throwable cause) {
LOG.warn("Failed to fire {} advisory, reason: {}", message, 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 { protected void fireAdvisory(ConnectionContext context, ActiveMQTopic topic, Command command) throws Exception {

2
activemq-broker/src/main/java/org/apache/activemq/broker/region/Queue.java
View File

@ -286,12 +286,12 @@ public class Queue extends BaseDestination implements Task, UsageListener, Index
} }
// Message could have expired while it was being // Message could have expired while it was being
// loaded.. // loaded..
message.setRegionDestination(Queue.this);
if (message.isExpired() && broker.isExpired(message)) { if (message.isExpired() && broker.isExpired(message)) {
toExpire.add(message); toExpire.add(message);
return true; return true;
} }
if (hasSpace()) { if (hasSpace()) {
message.setRegionDestination(Queue.this);
messagesLock.writeLock().lock(); messagesLock.writeLock().lock();
try { try {
try { try {