pumper NPE fix

This commit is contained in:
zzz
2011-11-26 22:57:23 +00:00
parent e4004e6f83
commit 6d5678c14e
2 changed files with 4 additions and 1 deletions

View File

@@ -1,5 +1,6 @@
2011-11-26 zzz
* DCCServer: Socket error log fix
* NTCP: Fix pumper NPE (ticket #555)
2011-11-23 zzz
* CryptixAESEngine: Fix bogus bounds checks

View File

@@ -615,7 +615,9 @@ class EventPumper implements Runnable {
// although it could be a read failure during the DH handshake
// Same stat as in processConnect()
_context.statManager().addRateData("ntcp.connectFailedTimeoutIOE", 1);
_transport.markUnreachable(con.getRemotePeer().calculateHash());
RouterIdentity rem = con.getRemotePeer();
if (rem != null)
_transport.markUnreachable(rem.calculateHash());
}
con.close();
} catch (NotYetConnectedException nyce) {