Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-02-11 17:55:53 +00:00
Code Issues Projects Releases Wiki Activity

Improve locking in PeerGroup. Do not use shutdownNow. Resolves issue 93

Browse Source
This commit is contained in:
Miron Cuperman (devrandom) 2011-11-13 00:02:03 +00:00
parent 4b268872df
commit 83354a34e6
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/google/bitcoin/core/PeerGroup.java
View File

@ -234,15 +234,16 @@ public class PeerGroup {
Thread.sleep(connectionDelayMillis);
}
} catch (InterruptedException ex) {
synchronized (this) {
running = false;
}
}
peerPool.shutdownNow();
synchronized (peers) {
for (Peer peer : peers) {
peer.disconnect();
synchronized (PeerGroup.this) {
running = false;
peerPool.shutdown();
synchronized (peers) {
for (Peer peer : peers) {
peer.disconnect();
}
}
peers = null; // Fail quickly if someone tries to access peers while we are shutting down.
}
}
@ -310,7 +311,16 @@ public class PeerGroup {
log.info("Connecting to " + peer);
peer.connect();
}
peers.add(peer);
synchronized (PeerGroup.this) {
// We may have started shutting down the group since we started connecting.
// In this case, we must not add ourself to the list of peers because the controller
// thread already went through it.
if (!running) {
peer.disconnect();
return;
}
peers.add(peer);
}
handleNewPeer(peer);
if (blockUntilRunning == ExecuteBlockMode.WAIT_FOR_STARTUP)
latch.countDown();
@ -330,7 +340,8 @@ public class PeerGroup {
}
} finally {
// We may be terminating because of a controlled shutdown. If so, don't inform the user of individual
// peer connections or select a new download peer.
// peer connections or select a new download peer. Disconnection is the responsibility of the controlling
// thread in this case.
if (!running)
return;