Repository: nifi Updated Branches: refs/heads/master 3ebfcd5ae -> 6f282c684
NIFI-4803: Ensure that we set the FileCountAttribute of BinManager to the proper value, regardless of the merge strategy This closes #2423. Signed-off-by: Bryan Bende <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6f282c68 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6f282c68 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6f282c68 Branch: refs/heads/master Commit: 6f282c6843066f79fc7d53ebec98b4e4bb39f833 Parents: 3ebfcd5 Author: Mark Payne <[email protected]> Authored: Mon Jan 22 14:50:19 2018 -0500 Committer: Bryan Bende <[email protected]> Committed: Mon Jan 22 15:37:31 2018 -0500 ---------------------------------------------------------------------- .../java/org/apache/nifi/processors/standard/MergeContent.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/6f282c68/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java index e78cd4f..5b8007b 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/MergeContent.java @@ -426,6 +426,8 @@ public class MergeContent extends BinFiles { protected void setUpBinManager(final BinManager binManager, final ProcessContext context) { if (MERGE_STRATEGY_DEFRAGMENT.equals(context.getProperty(MERGE_STRATEGY).getValue())) { binManager.setFileCountAttribute(FRAGMENT_COUNT_ATTRIBUTE); + } else { + binManager.setFileCountAttribute(null); } }
