From b1b06bf5e17b3b59c279e13d2011214c647d4042 Mon Sep 17 00:00:00 2001
From: Matt Gilman <matt.c.gilman@gmail.com>
Date: Wed, 5 Feb 2020 12:49:01 -0500
Subject: [PATCH] NIFI-6958: - Addressing issue causing errors preventing
 version changes when there is a processor to enable or disable in a sub
 process group.

---
 .../java/org/apache/nifi/groups/StandardProcessGroup.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
index fbcf664747..dedb6a92ca 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java
@@ -4633,9 +4633,9 @@ public final class StandardProcessGroup implements ProcessGroup {
             processor.setPosition(new Position(proposed.getPosition().getX(), proposed.getPosition().getY()));
 
             if (proposed.getScheduledState() == org.apache.nifi.registry.flow.ScheduledState.DISABLED) {
-                disableProcessor(processor);
+                processor.getProcessGroup().disableProcessor(processor);
             } else if (processor.getScheduledState() == ScheduledState.DISABLED) {
-                enableProcessor(processor);
+                processor.getProcessGroup().enableProcessor(processor);
             }
 
             if (!isEqual(processor.getBundleCoordinate(), proposed.getBundle())) {