This is an automated email from the ASF dual-hosted git repository.

bbende pushed a commit to branch NIFI-15258
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/NIFI-15258 by this push:
     new c46e2900a6 NIFI-15509: Enable Component reload additional classpath 
resources if needed (#10812)
c46e2900a6 is described below

commit c46e2900a6b71d6f6ed89ac245b5e86bd4ce3cc0
Author: Bob Paulin <[email protected]>
AuthorDate: Fri Jan 30 16:07:20 2026 -0600

    NIFI-15509: Enable Component reload additional classpath resources if 
needed (#10812)
---
 .../nifi/controller/service/StandardControllerServiceProvider.java   | 1 -
 .../src/main/java/org/apache/nifi/groups/StandardProcessGroup.java   | 2 --
 .../apache/nifi/controller/scheduling/StandardProcessScheduler.java  | 5 +++++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
 
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
index 95b3f34afa..167dff1da4 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceProvider.java
@@ -269,7 +269,6 @@ public class StandardControllerServiceProvider implements 
ControllerServiceProvi
         }
 
         serviceNode.verifyCanEnable();
-        serviceNode.reloadAdditionalResourcesIfNecessary();
         return processScheduler.enableControllerService(serviceNode);
     }
 
diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
 
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index 3987ea19f9..528842281e 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -1748,8 +1748,6 @@ public final class StandardProcessGroup implements 
ProcessGroup {
                 return CompletableFuture.completedFuture(null);
             }
 
-            processor.reloadAdditionalResourcesIfNecessary();
-
             return scheduler.startProcessor(processor, failIfStopping);
         } finally {
             readLock.unlock();
diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
 
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
index de8c18ed6a..740498adb6 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/scheduling/StandardProcessScheduler.java
@@ -441,6 +441,9 @@ public final class StandardProcessScheduler implements 
ProcessScheduler {
         };
 
         LOG.info("Starting {}", procNode);
+
+        procNode.reloadAdditionalResourcesIfNecessary();
+
         procNode.start(componentMonitoringThreadPool, 
administrativeYieldMillis, processorStartTimeoutMillis, processContextFactory, 
callback, failIfStopping, scheduleActions);
         return future;
     }
@@ -887,6 +890,8 @@ public final class StandardProcessScheduler implements 
ProcessScheduler {
 
         LOG.info("Enabling {}", service);
 
+        service.reloadAdditionalResourcesIfNecessary();
+
         final List<CompletableFuture<Void>> futures = new ArrayList<>();
         final List<ControllerServiceNode> dependentServices = 
service.getRequiredControllerServices();
         for (final ControllerServiceNode dependentService : dependentServices) 
{

Reply via email to