Repository: activemq Updated Branches: refs/heads/trunk ebafd5c19 -> 51566104a
https://issues.apache.org/jira/browse/AMQ-5447 shutdown the scheduled executer so that any scheduled tasks are canceled and removed on stop. Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/51566104 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/51566104 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/51566104 Branch: refs/heads/trunk Commit: 51566104abd46722c73d71534e7576b5377d799c Parents: ebafd5c Author: Timothy Bish <[email protected]> Authored: Tue Nov 25 14:56:19 2014 -0500 Committer: Timothy Bish <[email protected]> Committed: Tue Nov 25 14:56:30 2014 -0500 ---------------------------------------------------------------------- .../org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/51566104/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java ---------------------------------------------------------------------- diff --git a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java index 3c7c7cd..aea8fa0 100755 --- a/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java +++ b/activemq-jdbc-store/src/main/java/org/apache/activemq/store/jdbc/JDBCPersistenceAdapter.java @@ -55,6 +55,7 @@ import org.apache.activemq.util.FactoryFinder; import org.apache.activemq.util.IOExceptionSupport; import org.apache.activemq.util.LongSequenceGenerator; import org.apache.activemq.util.ServiceStopper; +import org.apache.activemq.util.ThreadPoolUtils; import org.apache.activemq.wireformat.WireFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -336,6 +337,8 @@ public class JDBCPersistenceAdapter extends DataSourceServiceSupport implements cleanupTicket.cancel(true); cleanupTicket = null; } + + ThreadPoolUtils.shutdown(clockDaemon); } public void cleanup() {
