bbende commented on code in PR #8726:
URL: https://github.com/apache/nifi/pull/8726#discussion_r1587901450


##########
nifi-framework-bundle/nifi-framework/nifi-framework-components/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java:
##########
@@ -4040,14 +4045,20 @@ public void verifyCanSaveToFlowRegistry(final String 
registryId, final String bu
 
                 // Flow ID matches. We want to publish the Process Group as 
the next version of the Flow, so we must
                 // ensure that all other parameters match as well.
+
+                if (branch != null && !Objects.equals(branch, 
vci.getBranch())) {

Review Comment:
   I'll take a look at this, but this is basically the same as the existing 
checks that are here to ensure that a new version being saved is not changing 
the bucketId/flowId/etc that it is already tracking against. The only 
difference here is that branch is optional when submitting the save, so we need 
to check that its not null. If its null, then the code during register will 
correctly select either the existing branch from VCI, or the default branch.



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to