Merge PR for AMQ-6706 This closes #254
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/3593afee Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/3593afee Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/3593afee Branch: refs/heads/master Commit: 3593afeebee12b2f34cae4d678a1e4876316ba1d Parents: 35f3df4 155461a Author: Christopher L. Shannon (cshannon) <[email protected]> Authored: Tue Jun 20 10:54:59 2017 -0400 Committer: Christopher L. Shannon (cshannon) <[email protected]> Committed: Tue Jun 20 10:55:29 2017 -0400 ---------------------------------------------------------------------- .../apache/activemq/broker/BrokerService.java | 26 ++++++- .../activemq/broker/BrokerServiceTest.java | 60 +++++++++++++++ .../activemq/camel/CamelShutdownHook.java | 73 ++++++++++++++++++ .../camel/BrokerPreShutdownHookTest.java | 80 ++++++++++++++++++++ 4 files changed, 238 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
