FELIX-2201: [FileInstall] Make Scanner process artifacts in 'oldest-file-modification-time first' order
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@937979 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
index 73c3072..54a5b87 100644
--- a/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
+++ b/fileinstall/src/main/java/org/apache/felix/fileinstall/internal/Scanner.java
@@ -20,11 +20,13 @@
import java.io.File;
import java.io.FilenameFilter;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.TreeSet;
import java.util.zip.CRC32;
/**
@@ -101,7 +103,7 @@
{
return null;
}
- Set/*<File>*/ files = new HashSet/*<File>*/();
+ Set/*<File>*/ files = new TreeSet/*<File>*/(new FileModificationTimeComparator());
Set/*<File>*/ removed = new HashSet/*<File>*/(storedChecksums.keySet());
for (int i = 0; i < list.length; i++)
{
@@ -186,4 +188,18 @@
}
}
+ /**
+ * {@link Comparator} that sorts {@link File}s in increasing order of modification time
+ * ("oldest first").
+ */
+ private final static class FileModificationTimeComparator implements Comparator
+ {
+ public int compare(Object arg0, Object arg1)
+ {
+ File lhs = (File) arg0;
+ File rhs = (File) arg1;
+ return (int) (lhs.lastModified() - rhs.lastModified());
+ }
+ }
+
}