Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-08-01 12:31:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Peer: Fix some more crashes that can occur when operating without a blockchain object

Browse Source
This commit is contained in:
Mike Hearn
2014-12-17 19:23:13 +01:00
parent c18423fde3
commit 200dc1294c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/org/bitcoinj/core/Peer.java
View File

@@ -89,7 +89,7 @@ public class Peer extends PeerSocketHandler {
private final AtomicInteger blocksAnnounced = new AtomicInteger(); private final AtomicInteger blocksAnnounced = new AtomicInteger();
// A class that tracks recent transactions that have been broadcast across the network, counts how many // A class that tracks recent transactions that have been broadcast across the network, counts how many
// peers announced them and updates the transaction confidence data. It is passed to each Peer. // peers announced them and updates the transaction confidence data. It is passed to each Peer.
private final TxConfidenceTable confidenceTable; @Nullable private final TxConfidenceTable confidenceTable;
// Each wallet added to the peer will be notified of downloaded transaction data. // Each wallet added to the peer will be notified of downloaded transaction data.
private final CopyOnWriteArrayList<Wallet> wallets; private final CopyOnWriteArrayList<Wallet> wallets;
// A time before which we only download block headers, after that point we download block bodies. // A time before which we only download block headers, after that point we download block bodies.
@@ -203,7 +203,7 @@ public class Peer extends PeerSocketHandler {
super(params, remoteAddress); super(params, remoteAddress);
this.params = Preconditions.checkNotNull(params); this.params = Preconditions.checkNotNull(params);
this.versionMessage = Preconditions.checkNotNull(ver); this.versionMessage = Preconditions.checkNotNull(ver);
this.vDownloadTxDependencies = downloadTxDependencies; this.vDownloadTxDependencies = chain != null && downloadTxDependencies;
this.blockChain = chain; // Allowed to be null. this.blockChain = chain; // Allowed to be null.
this.vDownloadData = chain != null; this.vDownloadData = chain != null;
this.getDataFutures = new CopyOnWriteArrayList<GetDataRequest>(); this.getDataFutures = new CopyOnWriteArrayList<GetDataRequest>();
@@ -213,7 +213,7 @@ public class Peer extends PeerSocketHandler {
this.isAcked = false; this.isAcked = false;
this.pendingPings = new CopyOnWriteArrayList<PendingPing>(); this.pendingPings = new CopyOnWriteArrayList<PendingPing>();
this.wallets = new CopyOnWriteArrayList<Wallet>(); this.wallets = new CopyOnWriteArrayList<Wallet>();
this.confidenceTable = chain.getContext().getConfidenceTable(); this.confidenceTable = chain != null ? chain.getContext().getConfidenceTable() : null;
} }
/** /**