NIFI-8190 Protect against property that references missing controller…

… service
nexr · Feb 1, 2021 · e0a8b47 · e0a8b47
1 parent b4e213c
commit e0a8b47
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/...nents/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java b/...nents/src/main/java/org/apache/nifi/controller/service/StandardControllerServiceNode.java
@@ -257,8 +257,14 @@ public List<ControllerServiceNode> getRequiredControllerServices() {
         for (Entry<PropertyDescriptor, String> entry : getEffectivePropertyValues().entrySet()) {
             PropertyDescriptor descriptor = entry.getKey();
             if (descriptor.getControllerServiceDefinition() != null && entry.getValue() != null) {
-                ControllerServiceNode requiredNode = serviceProvider.getControllerServiceNode(entry.getValue());
-                requiredServices.add(requiredNode);
+                // CS property could point to a non-existent CS, so protect against requiredNode being null
+                final String referenceId = entry.getValue();
+                final ControllerServiceNode requiredNode = serviceProvider.getControllerServiceNode(referenceId);
+                if (requiredNode != null) {
+                    requiredServices.add(requiredNode);
+                } else {
+                    LOG.warn("Unable to locate referenced controller service with id {}", referenceId);
+                }
             }
         }
         return new ArrayList<>(requiredServices);