Merge pull request #334 from spyrkob/GAL-353_1.1

[GAL-353] Sort hashes entries in .galleon/hashes folder
wildfly · Oct 27, 2023 · b7b16f0 · b7b16f0
2 parents 3ceaef4 + bb9c833
commit b7b16f0
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/core/src/main/java/org/jboss/galleon/ProvisioningManager.java b/core/src/main/java/org/jboss/galleon/ProvisioningManager.java
@@ -25,8 +25,10 @@
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.TreeSet;
 
 import org.jboss.galleon.config.FeaturePackConfig;
 import org.jboss.galleon.config.ProvisioningConfig;
@@ -870,7 +872,14 @@ private void persistChildHashes(Path hashes, FsEntry entry, List<FsEntry> dirs,
         int dirsTotal = 0;
         BufferedWriter writer = null;
         try {
-            for (FsEntry child : entry.getChildren()) {
+            final TreeSet<FsEntry> sortedChildren = new TreeSet<>(new Comparator<FsEntry>() {
+                @Override
+                public int compare(FsEntry e1, FsEntry e2) {
+                    return e1.getName().compareTo(e2.getName());
+                }
+            });
+            sortedChildren.addAll(entry.getChildren());
+            for (FsEntry child : sortedChildren) {
                 if (!child.isDir()) {
                     if (writer == null) {
                         writer = Files.newBufferedWriter(target.resolve(Constants.HASHES));