Repository: incubator-nifi Updated Branches: refs/heads/develop a183d88f2 -> ebf3cdc77
NIFI-215: Shut down the ProcessScheduler that is used for Reporting Tasks when NCM is stopped Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d879e0d6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d879e0d6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d879e0d6 Branch: refs/heads/develop Commit: d879e0d640a1bc6c4de2ea3a4ad2666a00b18e29 Parents: a183d88 Author: Mark Payne <marka...@hotmail.com> Authored: Wed Dec 31 08:07:40 2014 -0500 Committer: Mark Payne <marka...@hotmail.com> Committed: Wed Dec 31 08:07:40 2014 -0500 ---------------------------------------------------------------------- .../org/apache/nifi/cluster/manager/impl/WebClusterManager.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d879e0d6/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java b/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java index 3defea7..511bb7d 100644 --- a/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java +++ b/nar-bundles/framework-bundle/framework/cluster/src/main/java/org/apache/nifi/cluster/manager/impl/WebClusterManager.java @@ -512,6 +512,10 @@ public class WebClusterManager implements HttpClusterManager, ProtocolHandler, C servicesBroadcaster.stop(); } + if ( processScheduler != null ) { + processScheduler.shutdown(); + } + if (encounteredException) { throw new IOException("Failed to shutdown Cluster Manager because one or more cluster services failed to shutdown. Check the logs for details."); }
