[nifi] branch main updated (a71556f115 -> bda624823b)

[ma...@apache.org]

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

mattyb149 pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


    from a71556f115 NIFI-10491 Added Conflict Resolution Strategy to PutAzureBlobStorage_v12
     add bda624823b NIFI-10817: Moved the calls in StandardProcessSession to 'resetState()' and 'acknowledgeRecords()' from the outer commit(boolean) to the inner commit(Checkpoint, boolean). By moving the call here, the logic of StandardProcessSession is unaffected. But the StatelessProcessSession that inherits from it now has the benefit of having the state cleaned up when calling super.commit(Checkpoint, boolean).

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/nifi/processor/util/bin/BinFiles.java    |  8 +++++---
 .../nifi/controller/repository/StandardProcessSession.java   |  9 +++++----
 .../org/apache/nifi/processors/standard/MergeContent.java    |  3 ++-
 .../apache/nifi/stateless/flow/StandardStatelessFlow.java    |  5 +++++
 .../apache/nifi/stateless/queue/StatelessFlowFileQueue.java  | 10 ++++++++++
 .../stateless/repository/ByteArrayContentRepository.java     | 12 +++++++++++-
 .../repository/TestStatelessFileSystemContentRepository.java |  2 +-
 7 files changed, 39 insertions(+), 10 deletions(-)