I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix disconnect race NPE

Browse Source
This commit is contained in:
zzz
2010-10-24 16:56:43 +00:00
parent adab0cc3d3
commit 4f9c442d55
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java
View File

@ -190,6 +190,7 @@ public class I2PSnarkUtil {
*/ */
public void disconnect() { public void disconnect() {
I2PSocketManager mgr = _manager; I2PSocketManager mgr = _manager;
// FIXME this can cause race NPEs elsewhere
_manager = null; _manager = null;
_shitlist.clear(); _shitlist.clear();
mgr.destroySocketManager(); mgr.destroySocketManager();
@ -201,6 +202,9 @@ public class I2PSnarkUtil {
/** connect to the given destination */ /** connect to the given destination */
I2PSocket connect(PeerID peer) throws IOException { I2PSocket connect(PeerID peer) throws IOException {
I2PSocketManager mgr = _manager;
if (mgr == null)
throw new IOException("No socket manager");
Destination addr = peer.getAddress(); Destination addr = peer.getAddress();
if (addr == null) if (addr == null)
throw new IOException("Null address"); throw new IOException("Null address");