From 787e0d82614e345b5afbef6691c418c43cf0ab08 Mon Sep 17 00:00:00 2001
From: Mark Payne <markap14@hotmail.com>
Date: Mon, 12 Jun 2023 16:55:41 -0400
Subject: [PATCH] NIFI-11681: Terminate Process Sessions before interrupting
 processor threads

This closes #7371

Signed-off-by: David Handermann <exceptionfactory@apache.org>
---
 .../nifi/controller/scheduling/StandardProcessScheduler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index c9633bf89d..b3e810c09b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -436,8 +436,8 @@ public final class StandardProcessScheduler implements ProcessScheduler {
 
         LOG.debug("Terminating {}", procNode);
 
-        final int tasksTerminated = procNode.terminate();
         state.terminate();
+        final int tasksTerminated = procNode.terminate();
 
         getSchedulingAgent(procNode).incrementMaxThreadCount(tasksTerminated);