(nifi) branch support/nifi-1.x updated: NIFI-12969: Fixed a typo in the #isTempDestinationNecessary method, where we were comparing existingConnection.getProcessGroup() to newDestination.getProcessGroup(), instead of comparing existingConnection.getDestination().getProcessGroup() to newDestination.getProcessGroup(). I.e., we were comparing the Destination's PG to the Connection's PG instead of comparing Destination's PG to Destination's PG. This resulted in using a temporary funnel when we shouldn't. And as a result it attempted [...]

[joewitt]

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

joewitt pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
     new 212763dd79 NIFI-12969: Fixed a typo in the #isTempDestinationNecessary 
method, where we were comparing existingConnection.getProcessGroup() to 
newDestination.getProcessGroup(), instead of comparing 
existingConnection.getDestination().getProcessGroup() to 
newDestination.getProcessGroup(). I.e., we were comparing the Destination's PG 
to the Connection's PG instead of comparing Destination's PG to Destination's 
PG. This resulted in using a temporary funnel when we shouldn't. And as  [...]
212763dd79 is described below

commit 212763dd79b3652c9870ff6a59db28c232113c55
Author: Mark Payne <marka...@hotmail.com>
AuthorDate: Wed Apr 3 16:35:35 2024 -0400

    NIFI-12969: Fixed a typo in the #isTempDestinationNecessary method, where 
we were comparing existingConnection.getProcessGroup() to 
newDestination.getProcessGroup(), instead of comparing 
existingConnection.getDestination().getProcessGroup() to 
newDestination.getProcessGroup(). I.e., we were comparing the Destination's PG 
to the Connection's PG instead of comparing Destination's PG to Destination's 
PG. This resulted in using a temporary funnel when we shouldn't. And as a 
result it atte [...]
    
    Signed-off-by: Joseph Witt <joew...@apache.org>
---
 .../flow/synchronization/StandardVersionedComponentSynchronizer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
index 0951775778..12420e3764 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/flow/synchronization/StandardVersionedComponentSynchronizer.java
@@ -735,7 +735,7 @@ public class StandardVersionedComponentSynchronizer 
implements VersionedComponen
         // If the destination is an Input Port or an Output Port and the group 
changed, use a temp destination
         final ConnectableType connectableType = 
newDestination.getConnectableType();
         final boolean port = connectableType == ConnectableType.OUTPUT_PORT || 
connectableType == ConnectableType.INPUT_PORT;
-        final boolean groupChanged = 
!newDestination.getProcessGroup().equals(existingConnection.getProcessGroup());
+        final boolean groupChanged = 
!newDestination.getProcessGroup().equals(existingConnection.getDestination().getProcessGroup());
         if (port && groupChanged) {
             LOG.debug("Will use a temporary destination for {} because its 
destination is a port whose group has changed", existingConnection);
             return true;