mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-12 02:08:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

TorDiscovery: Bugfix. Guava now returns immutable lists from Futures methods (annoying).

Browse source
This commit is contained in:
Mike Hearn 2014-04-27 18:11:50 +02:00
parent 9cfb420cdb
commit d39cc8838e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/com/google/bitcoin/net/discovery/TorDiscovery.java
View file

@ -49,6 +49,8 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static java.util.Collections.singleton;
/** /**
* <p>Supports peer discovery through Tor.</p> * <p>Supports peer discovery through Tor.</p>
* *
@ -160,11 +162,10 @@ public class TorDiscovery implements PeerDiscovery {
} }
} }
List<Circuit> circuits;
try { try {
circuits = Futures.successfulAsList(circuitFutures).get(); List<Circuit> circuits = new ArrayList<Circuit>(Futures.successfulAsList(circuitFutures).get());
// Any failures will result in null entries. Remove them. // Any failures will result in null entries. Remove them.
circuits.removeAll(Collections.singleton(null)); circuits.removeAll(singleton(null));
return circuits; return circuits;
} catch (ExecutionException e) { } catch (ExecutionException e) {
// Cannot happen, successfulAsList accepts failures // Cannot happen, successfulAsList accepts failures
@ -199,9 +200,9 @@ public class TorDiscovery implements PeerDiscovery {
} }
try { try {
List<Lookup> lookups = Futures.successfulAsList(lookupFutures).get(); List<Lookup> lookups = new ArrayList<Lookup>(Futures.successfulAsList(lookupFutures).get());
// Any failures will result in null entries. Remove them. // Any failures will result in null entries. Remove them.
lookups.removeAll(Collections.singleton(null)); lookups.removeAll(singleton(null));
// Use a map to enforce one result per exit node // Use a map to enforce one result per exit node
// TODO: randomize result selection better // TODO: randomize result selection better