crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Improve shutdown of Network.

Browse Source 
Detect interrupt during peer connect so we can return without trying
to set up new peer.

Do join() after interrupt() in Network.shutdown.
This commit is contained in:
catbref 2019-06-18 11:16:59 +01:00
parent c68e0eb6ea
commit 84f5935d38
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/qora/network/Network.java
View File

@ -362,6 +362,9 @@ public class Network extends Thread {
if (!newPeer.connect()) if (!newPeer.connect())
return; return;
if (this.isInterrupted())
return;
synchronized (this.connectedPeers) { synchronized (this.connectedPeers) {
this.connectedPeers.add(newPeer); this.connectedPeers.add(newPeer);
} }
@ -824,6 +827,11 @@ public class Network extends Thread {
peerExecutor.shutdownNow(); peerExecutor.shutdownNow();
this.interrupt(); this.interrupt();
try {
this.join();
} catch (InterruptedException e) {
// We were interrupted while waiting for thread to join
}
} }
} }