Skip to content

Commit 6a45b92

Browse files
authored
Merge pull request #1221 from gdufrene/fix/TransmissionFileOrder
Fix potential file ordering issue.
2 parents ce7a3dc + 11c22e2 commit 6a45b92

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

core/src/main/java/com/microsoft/applicationinsights/internal/channel/common/TransmissionFileSystemOutput.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -226,15 +226,7 @@ private List<File> sortOldestLastAndTrim(Collection<File> transmissions, int lim
226226
Collections.sort(asList, new Comparator<File>() {
227227
@Override
228228
public int compare(File file1, File file2) {
229-
long file1LastModified = file1.lastModified();
230-
long file2LastModified = file2.lastModified();
231-
if (file1LastModified < file2LastModified) {
232-
return 1;
233-
} else if (file1LastModified > file2LastModified) {
234-
return -1;
235-
}
236-
237-
return 0;
229+
return file2.getName().compareTo(file1.getName());
238230
}
239231
});
240232

@@ -309,7 +301,8 @@ private boolean saveTransmission(File transmissionFile, Transmission transmissio
309301
private Optional<File> createTemporaryFile() {
310302
File file = null;
311303
try {
312-
file = File.createTempFile(TRANSMISSION_FILE_PREFIX, null, folder);
304+
String prefix = TRANSMISSION_FILE_PREFIX + "-" + System.currentTimeMillis() + "-";
305+
file = File.createTempFile(prefix, null, folder);
313306
} catch (IOException e) {
314307
InternalLogger.INSTANCE.error("Failed to create temporary file, exception: %s", e.toString());
315308
}

0 commit comments

Comments
 (0)