From ee5d557d2a0a155493d0bf2b59946455a26cd792 Mon Sep 17 00:00:00 2001
From: sopan98 <phaltankarsopan@gmail.com>
Date: Mon, 28 Nov 2022 23:57:16 -0600
Subject: [PATCH] NIFI-10891 Replaced HashMap with LinkedHashMap in BinFiles

- Resolved non-deterministic behavior in TestMergeContent.testDefragmentMultipleMingledSegments

This closes #6727

Signed-off-by: David Handermann <exceptionfactory@apache.org>
---
 .../java/org/apache/nifi/processor/util/bin/BinFiles.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java b/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
index c9d40829dd..ba363bb58e 100644
--- a/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
+++ b/nifi-nar-bundles/nifi-extension-utils/nifi-bin-manager/src/main/java/org/apache/nifi/processor/util/bin/BinFiles.java
@@ -36,7 +36,7 @@ import org.apache.nifi.processor.util.StandardValidators;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Queue;
@@ -280,7 +280,7 @@ public abstract class BinFiles extends AbstractSessionFactoryProcessor {
                 break;
             }
 
-            final Map<String, List<FlowFile>> flowFileGroups = new HashMap<>();
+            final Map<String, List<FlowFile>> flowFileGroups = new LinkedHashMap<>();
             for (FlowFile flowFile : flowFiles) {
                 flowFile = this.preprocessFlowFile(context, session, flowFile);