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

fix up master advisory, advisories are only fired after broker is fully started so the nowMaster advisory needs to ocurr after start rather than as part of persistence adapter start, resolves org.apache.activemq.broker.ft.QueueMasterSlaveTestSupport#testAdvisory failures 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428397 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2013-01-03 15:17:35 +00:00
parent 157aaf9167
commit 69d8258308
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -662,6 +662,7 @@ public class BrokerService implements Service {
getBroker().brokerServiceStarted(); getBroker().brokerServiceStarted();
checkSystemUsageLimits(); checkSystemUsageLimits();
startedLatch.countDown(); startedLatch.countDown();
getBroker().nowMasterBroker();
} }
/** /**

3
activemq-broker/src/main/java/org/apache/activemq/broker/LockableServiceSupport.java
View File

@ -89,9 +89,6 @@ public abstract class LockableServiceSupport extends ServiceSupport implements L
} }
}, lockKeepAlivePeriod, lockKeepAlivePeriod, TimeUnit.MILLISECONDS); }, lockKeepAlivePeriod, lockKeepAlivePeriod, TimeUnit.MILLISECONDS);
} }
if (brokerService != null) {
brokerService.getBroker().nowMasterBroker();
}
} }
} }
} }