mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-09 05:14:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some races in PeerMonitor.

Browse source
This commit is contained in:
Mike Hearn 2013-02-05 15:14:34 +01:00
parent 6ac8eb54cb
commit f488c29c12
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
examples/src/main/java/com/google/bitcoin/examples/PeerMonitor.java
View file

@ -22,6 +22,7 @@ import com.google.bitcoin.core.Peer;
import com.google.bitcoin.core.PeerGroup;
import com.google.bitcoin.discovery.DnsDiscovery;
import com.google.bitcoin.utils.BriefLogFormatter;
import com.google.common.collect.Lists;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@ -139,8 +140,8 @@ public class PeerMonitor {
public static final int PING_TIME = 4;
public static final int LAST_PING_TIME = 5;
public List<Peer> connectedPeers;
public List<Peer> pendingPeers;
public List<Peer> connectedPeers = Lists.newArrayList();
public List<Peer> pendingPeers = Lists.newArrayList();
public void updateFromPeerGroup() {
connectedPeers = peerGroup.getConnectedPeers();
@ -149,7 +150,7 @@ public class PeerMonitor {
}
public int getRowCount() {
return peerGroup.numConnectedPeers() + peerGroup.getPendingPeers().size();
return connectedPeers.size() + pendingPeers.size();
}
@Override
@ -183,12 +184,9 @@ public class PeerMonitor {
}
public Object getValueAt(int row, int col) {
// This is racy. A peer can be moving from pending to connected between these two lines.
List<Peer> peers = peerGroup.getConnectedPeers();
List<Peer> pendingPeers = peerGroup.getPendingPeers();
if (row >= peers.size()) {
if (row >= connectedPeers.size()) {
// Peer that isn't connected yet.
Peer peer = pendingPeers.get(row - peers.size());
Peer peer = pendingPeers.get(row - connectedPeers.size());
switch (col) {
case IP_ADDRESS:
return peer.getAddress().getAddr().getHostAddress();
@ -202,7 +200,7 @@ public class PeerMonitor {
return "(pending)";
}
}
Peer peer = peers.get(row);
Peer peer = connectedPeers.get(row);
switch (col) {
case IP_ADDRESS:
return peer.getAddress().getAddr().getHostAddress();