From 2ae209582d2ae837cfa03755d8da7685ca379026 Mon Sep 17 00:00:00 2001
From: Bob Paulin <bob@bobpaulin.com>
Date: Fri, 10 Jul 2026 08:13:59 -0500
Subject: [PATCH] NIFI-16099: Controller Service Provider should be passed to
 Connectors

---
 .../main/java/org/apache/nifi/controller/ExtensionBuilder.java   | 1 +
 .../org/apache/nifi/controller/flow/StandardFlowManager.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/ExtensionBuilder.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/ExtensionBuilder.java
index 103a47bee191..0ba051dcf197 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/ExtensionBuilder.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/ExtensionBuilder.java
@@ -497,6 +497,7 @@ public ConnectorNode buildConnector(final boolean loadInitialFlow) {
         requireNonNull(identifier, "Connector ID");
         requireNonNull(type, "Connector Type");
         requireNonNull(bundleCoordinate, "Bundle Coordinate");
+        requireNonNull(serviceProvider, "Controller Service Provider");
         requireNonNull(extensionManager, "Extension Manager");
         requireNonNull(managedProcessGroup, "Managed Process Group");
 
diff --git a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java
index 59763f81a9bc..902f6301e31c 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java
+++ b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/flow/StandardFlowManager.java
@@ -776,6 +776,7 @@ public ConnectorNode createConnector(final String type, final String id, final B
             .type(type)
             .bundleCoordinate(coordinate)
             .extensionManager(extensionManager)
+            .controllerServiceProvider(flowController.getControllerServiceProvider())
             .managedProcessGroup(managedRootGroup)
             .activeConfigurationContext(activeConfigurationContext)
             .flowContextFactory(flowContextFactory)