mirror of https://github.com/apache/activemq.git
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:
parent
31d99b6aa9
commit
93092f7ea0
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in New Issue