bbende commented on a change in pull request #3499: NIFI-6328 Allowing force-commit when in LOCALLY_MODIFIED_AND_STALE state URL: https://github.com/apache/nifi/pull/3499#discussion_r293114092
########## File path: nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/groups/StandardProcessGroup.java ########## @@ -4697,7 +4697,7 @@ public void verifyCanSaveToFlowRegistry(final String registryId, final String bu // Flow ID is the same. We want to publish the Process Group as the next version of the Flow. // In order to do this, we have to ensure that the Process Group is 'current'. final VersionedFlowState state = vci.getStatus().getState(); - if (state == VersionedFlowState.STALE || state == VersionedFlowState.LOCALLY_MODIFIED_AND_STALE) { + if (state == VersionedFlowState.STALE) { Review comment: Good catch, I pushed up some changes that should address this. Required a few additional changes to pass the action down to this point in the code, and also realized we never initially ensured the action was present and valid, so added that as well. ---------------------------------------------------------------- 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. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services