diff options
author | Harald Musum <musum@yahooinc.com> | 2022-07-12 10:07:13 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-07-12 10:07:13 +0200 |
commit | 8ac83388146d3741c91272932fa8cbb8aaa9076c (patch) | |
tree | e6fbfafe3179a96af42c4060cbd33cc630bb37b3 /configserver | |
parent | e65c9d4cc7d4950f309b50b8d5443e97188d6321 (diff) |
Use a simpler comparison instead of implementing Comparator interface
in a way that could fail in some cases.
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index 7949c2633e0..ffb6c038b70 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -96,6 +96,7 @@ import java.time.Clock; import java.time.Duration; import java.time.Instant; import java.util.Collection; +import java.util.Comparator; import java.util.HashMap; import java.util.HashSet; import java.util.List; @@ -631,15 +632,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye .stream() .filter(fileReference -> ! fileReferencesInUse.contains(fileReference)) .filter(fileReference -> isLastFileAccessBefore(new File(fileReferencesPath, fileReference), instant)) - .sorted((a, b) -> { - if (a.equals(b)) - return 0; - else if (lastAccessed(new File(fileReferencesPath, a)) - .isBefore(lastAccessed(new File(fileReferencesPath, b)))) - return -1; - else - return 1; - }) + .sorted(Comparator.comparing(a -> lastAccessed(new File(fileReferencesPath, a)))) .collect(Collectors.toList()); } |