echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge of '174649506cd8a9665ad798c090e39481af967011'

Browse Source 
and '67eb724b7638284d33f1b4997183cc9f197d2883'
This commit is contained in:
zzz
2015-05-15 14:17:41 +00:00
parent dc777c8de5 1f17d2a149
commit 10556bca75
9 changed files with 80 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
router/java/src/net/i2p/router/transport/ntcp/Reader.java
View File

@ -98,8 +98,10 @@ class Reader {
if (keepReading) {
// keep on reading the same one
} else {
_liveReads.remove(con);
con = null;
if (con != null) {
_liveReads.remove(con);
con = null;
}
if (_pendingConnections.isEmpty()) {
_pendingConnections.wait();
} else {
@ -116,6 +118,10 @@ class Reader {
_log.debug("begin read for " + con);
try {
processRead(con);
} catch (IllegalStateException ise) {
// FailedEstablishState.receive() (race - see below)
if (_log.shouldWarn())
_log.warn("Error in the ntcp reader", ise);
} catch (RuntimeException re) {
_log.log(Log.CRIT, "Error in the ntcp reader", re);
}
@ -153,6 +159,7 @@ class Reader {
EventPumper.releaseBuf(buf);
break;
}
// FIXME call est.isCorrupt() before also? throws ISE here... see above
est.receive(buf);
EventPumper.releaseBuf(buf);
if (est.isCorrupt()) {