AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Synchronize hasInvalidBlock predicate, as it wasn't thread safe

Browse Source
This commit is contained in:
CalDescent 2022-06-25 14:12:21 +01:00
parent 7e1ce38f0a
commit a2e1efab90
2 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/qortal/controller/Controller.java
View File

@ -723,6 +723,7 @@ public class Controller extends Thread {
}; };
public static final Predicate<Peer> hasInvalidBlock = peer -> { public static final Predicate<Peer> hasInvalidBlock = peer -> {
synchronized (peer.peerInfoLock) {
final PeerChainTipData peerChainTipData = peer.getChainTipData(); final PeerChainTipData peerChainTipData = peer.getChainTipData();
Map<ByteArray, Long> invalidBlockSignatures = Synchronizer.getInstance().getInvalidBlockSignatures(); Map<ByteArray, Long> invalidBlockSignatures = Synchronizer.getInstance().getInvalidBlockSignatures();
List<byte[]> peerSignatures = new ArrayList<>(); List<byte[]> peerSignatures = new ArrayList<>();
@ -756,6 +757,7 @@ public class Controller extends Thread {
} }
} }
return false; return false;
}
}; };
public static final Predicate<Peer> hasNoRecentBlock = peer -> { public static final Predicate<Peer> hasNoRecentBlock = peer -> {

2
src/main/java/org/qortal/network/Peer.java
View File

@ -121,7 +121,7 @@ public class Peer {
// Peer info // Peer info
private final Object peerInfoLock = new Object(); public final Object peerInfoLock = new Object();
private String peersNodeId; private String peersNodeId;
private byte[] peersPublicKey; private byte[] peersPublicKey;