From f0d9982ee4bf95636c24f63e57d59fa72f12f435 Mon Sep 17 00:00:00 2001 From: CalDescent Date: Sat, 12 Mar 2022 09:43:56 +0000 Subject: [PATCH] Made arbitraryDataFileHashResponses final, and use .sort() rather than .stream() to avoid new instance creation. --- .../qortal/controller/arbitrary/ArbitraryDataFileManager.java | 2 +- .../controller/arbitrary/ArbitraryDataFileRequestThread.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java index a529282c..e8b161a2 100644 --- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java +++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java @@ -48,7 +48,7 @@ public class ArbitraryDataFileManager extends Thread { /** * List to keep track of any arbitrary data file hash responses */ - public List arbitraryDataFileHashResponses = Collections.synchronizedList(new ArrayList<>()); + public final List arbitraryDataFileHashResponses = Collections.synchronizedList(new ArrayList<>()); /** * List to keep track of peers potentially available for direct connections, based on recent requests diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileRequestThread.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileRequestThread.java index a2bfd152..2d1beadc 100644 --- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileRequestThread.java +++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileRequestThread.java @@ -55,9 +55,7 @@ public class ArbitraryDataFileRequestThread implements Runnable { // Sort by lowest number of node hops first Comparator lowestHopsFirstComparator = Comparator.comparingInt(ArbitraryFileListResponseInfo::getRequestHops); - List sortedResponses = arbitraryDataFileManager.arbitraryDataFileHashResponses - .stream().sorted(lowestHopsFirstComparator).collect(Collectors.toList()); - arbitraryDataFileManager.arbitraryDataFileHashResponses = Collections.synchronizedList(sortedResponses); + arbitraryDataFileManager.arbitraryDataFileHashResponses.sort(lowestHopsFirstComparator); Iterator iterator = arbitraryDataFileManager.arbitraryDataFileHashResponses.iterator(); while (iterator.hasNext()) {