NIFI-259: Ensured that thread pools were being shutdown properly
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/09357297 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/09357297 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/09357297 Branch: refs/heads/master Commit: 09357297e283d72eea288cf91e383d1fdfb3d9f3 Parents: f6ec437 Author: Mark Payne <marka...@hotmail.com> Authored: Thu Jan 21 12:00:40 2016 -0500 Committer: Mark Payne <marka...@hotmail.com> Committed: Thu Jan 21 12:00:40 2016 -0500 ---------------------------------------------------------------------- .../apache/nifi/remote/client/socket/EndpointConnectionPool.java | 1 + .../state/providers/local/WriteAheadLocalStateProvider.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/09357297/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java ---------------------------------------------------------------------- diff --git a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java index 81ca70d..0dde17d 100644 --- a/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java +++ b/nifi-commons/nifi-site-to-site-client/src/main/java/org/apache/nifi/remote/client/socket/EndpointConnectionPool.java @@ -182,6 +182,7 @@ public class EndpointConnectionPool { public Thread newThread(final Runnable r) { final Thread thread = defaultFactory.newThread(r); thread.setName("NiFi Site-to-Site Connection Pool Maintenance"); + thread.setDaemon(true); return thread; } }); http://git-wip-us.apache.org/repos/asf/nifi/blob/09357297/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/providers/local/WriteAheadLocalStateProvider.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/providers/local/WriteAheadLocalStateProvider.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/providers/local/WriteAheadLocalStateProvider.java index ba8e4d9..7d16a10 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/providers/local/WriteAheadLocalStateProvider.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/state/providers/local/WriteAheadLocalStateProvider.java @@ -129,6 +129,8 @@ public class WriteAheadLocalStateProvider extends AbstractStateProvider { @Override public synchronized void shutdown() { + executor.shutdown(); + try { writeAheadLog.shutdown(); } catch (final IOException ioe) {
