Fix Tor support does not use all available HTTP seeds.

bitcoinj · Aug 24, 2015 · a12ec7f · a12ec7f
1 parent 2c8ffc8
commit a12ec7f
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/core/src/main/java/org/bitcoinj/core/PeerGroup.java b/core/src/main/java/org/bitcoinj/core/PeerGroup.java
@@ -337,9 +337,12 @@ public static PeerGroup newWithTor(Context context, @Nullable AbstractBlockChain
             HttpDiscovery.Details[] httpSeeds = params.getHttpSeeds();
             if (httpSeeds.length > 0) {
                 // Use HTTP discovery when Tor is active and there is a Cartographer seed, for a much needed speed boost.
-                OkHttpClient client = new OkHttpClient();
-                client.setSocketFactory(torClient.getSocketFactory());
-                result.addPeerDiscovery(new HttpDiscovery(params, httpSeeds[0], client));
+                OkHttpClient httpClient = new OkHttpClient();
+                httpClient.setSocketFactory(torClient.getSocketFactory());
+                List<PeerDiscovery> discoveries = Lists.newArrayList();
+                for (HttpDiscovery.Details httpSeed : httpSeeds)
+                    discoveries.add(new HttpDiscovery(params, httpSeed, httpClient));
+                result.addPeerDiscovery(new MultiplexingDiscovery(params, discoveries));
             } else {
                 result.addPeerDiscovery(new TorDiscovery(params, torClient));
             }